Changeset 06b2d12 for patches

Timestamp:

Aug 26, 2012, 6:48:21 PM (12 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

68a11fb

Parents:

6ecbe33

Message:

delete old patches and add new patches.

Location:

patches

Files:

• binutils-2.22-branch_update-1.patch (added)
• flex-2.5.35-gcc44-1.patch (deleted)
• gcc-4.6.3-branch_update-1.patch (added)
• iproute2-3.3.0-libdir-1.patch (deleted)
• iproute2-3.4.0-libdir-1.patch (added)
• ncurses-5.9-branch_update-4.patch (moved) (moved from patches/ncurses-5.9-branch_update-3.patch ) (1599 diffs)
• perl-5.14.2-Configure_multilib-1.patch (deleted)
• perl-5.14.2-libc-1.patch (deleted)
• perl-5.16.1-Configure_multilib-1.patch (added)
• perl-5.16.1-libc-1.patch (added)

patches/ncurses-5.9-branch_update-4.patch

@@ -1 +1 @@
 Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
-Date: 2012-02-16
+Date: 2012-08-25
 Initial Package Version: 5.9
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 5.9-20111224
+Description: Contains all upstream patches up to 5.9-20120616
 
 diff -Naur ncurses-5.9.orig/Ada95/aclocal.m4 ncurses-5.9/Ada95/aclocal.m4
---- ncurses-5.9.orig/Ada95/aclocal.m4   2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/aclocal.m4        2012-02-16 18:25:13.167823445 +0000
+--- ncurses-5.9.orig/Ada95/aclocal.m4   2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/Ada95/aclocal.m4        2012-08-25 19:58:02.099888180 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -21 +21 @@
  dnl
 -dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $
-+dnl $Id: aclocal.m4,v 1.44 2012/01/22 00:33:42 tom Exp $
++dnl $Id: aclocal.m4,v 1.52 2012/08/04 18:12:47 tom Exp $
  dnl Macros used in NCURSES Ada95 auto-configuration script.
  dnl
@@ -94 +94 @@
  cf_cv_ansi_cc=no
  cf_save_CFLAGS="$CFLAGS"
-@@ -504,7 +550,7 @@
+@@ -413,6 +459,35 @@
+ AC_SUBST(ARFLAGS)
+ ])
+ dnl ---------------------------------------------------------------------------
++dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
++dnl --------------
++dnl Allow user to disable a normally-on option.
++AC_DEFUN([CF_ARG_DISABLE],
++[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
++dnl -------------
++dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
++dnl values.
++dnl
++dnl Parameters:
++dnl $1 = option name
++dnl $2 = help-string
++dnl $3 = action to perform if option is not default
++dnl $4 = action if perform if option is default
++dnl $5 = default option value (either 'yes' or 'no')
++AC_DEFUN([CF_ARG_OPTION],
++[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
++  if test "$enableval" != "$5" ; then
++ifelse([$3],,[    :]dnl
++,[    $3]) ifelse([$4],,,[
++  else
++    $4])
++  fi],[enableval=$5 ifelse([$4],,,[
++  $4
++])dnl
++  ])])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+@@ -504,7 +579,7 @@
  AC_SUBST(BUILD_OBJEXT)
  ])dnl
@@ -103 +139 @@
  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
-@@ -522,7 +568,7 @@
+@@ -522,7 +597,7 @@
  if test "x$prefix" = "xNONE" ; then
         case "$cf_cv_system_name" in
@@ -112 +148 @@
                 ;;
         *)      prefix=$ac_default_prefix
-@@ -593,7 +639,7 @@
+@@ -593,7 +668,40 @@
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
++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 not ignore some gcc options.
++dnl
++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
++dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
++dnl the wrappers for gcc and g++ warnings.
++dnl
++dnl $1 = GCC (default) or GXX
++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
++dnl $3 = CFLAGS (default) or CXXFLAGS
++AC_DEFUN([CF_CLANG_COMPILER],[
++ifelse([$2],,CLANG_COMPILER,[$2])=no
++
++if test "$ifelse([$1],,[$1],GCC)" = yes ; then
++       AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
++       cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
++       ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
++       AC_TRY_COMPILE([],[
++#ifdef __clang__
++#else
++make an error
++#endif
++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++],[])
++       ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
++       AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
++fi
++])
++dnl ---------------------------------------------------------------------------
 +dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45
  dnl ----------------
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
-@@ -603,10 +649,10 @@
+@@ -603,10 +711,10 @@
  AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
  cf_cv_ncurses_header=none
@@ -136 +205 @@
  AC_TRY_COMPILE([#include <${cf_header}>],
         [initscr(); tgoto("?", 0,0)],
-@@ -627,6 +673,31 @@
+@@ -627,6 +735,67 @@
  dnl "dirname" is not portable, so we fake it with a shell script.
  AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
  dnl ---------------------------------------------------------------------------
-+dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
++dnl ---------------
++dnl You can always use "make -n" to see the actual options, but it's hard to
++dnl pick out/analyze warning messages when the compile-line is long.
++dnl
++dnl Sets:
++dnl    ECHO_LT - symbol to control if libtool is verbose
++dnl    ECHO_LD - symbol to prefix "cc -o" lines
++dnl    RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
++dnl    SHOW_CC - symbol to put before explicit "cc -c" lines
++dnl    ECHO_CC - symbol to put before any "cc" line
++dnl
++AC_DEFUN([CF_DISABLE_ECHO],[
++AC_MSG_CHECKING(if you want to see long compiling messages)
++CF_ARG_DISABLE(echo,
++       [  --disable-echo          display "compiling" commands],
++       [
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking [$]@;'
++    RULE_CC='@echo compiling [$]<'
++    SHOW_CC='@echo compiling [$]@'
++    ECHO_CC='@'
++],[
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++])
++AC_MSG_RESULT($enableval)
++AC_SUBST(ECHO_LT)
++AC_SUBST(ECHO_LD)
++AC_SUBST(RULE_CC)
++AC_SUBST(SHOW_CC)
++AC_SUBST(ECHO_CC)
++])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
 +dnl ------------------
 +dnl This is the "--enable-pc-files" option, which is available if there is a
@@ -149 +255 @@
 +
 +if test "$PKG_CONFIG" != none ; then
-+       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-+               AC_ARG_ENABLE(pc-files,
-+                       [  --enable-pc-files       generate and install .pc files for pkg-config],
-+                       [enable_pc_files=$enableval],
-+                       [enable_pc_files=no])
-+               AC_MSG_RESULT($enable_pc_files)
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-+               enable_pc_files=no
-+               AC_MSG_WARN(did not find $PKG_CONFIG library)
++       AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
++       AC_ARG_ENABLE(pc-files,
++               [  --enable-pc-files       generate and install .pc files for pkg-config],
++               [enable_pc_files=$enableval],
++               [enable_pc_files=no])
++       AC_MSG_RESULT($enable_pc_files)
++       if test "$enable_pc_files" != no
++       then
++               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
 +       fi
 +else
@@ -168 +273 @@
  dnl ---------------
  dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
-@@ -1070,53 +1141,6 @@
+@@ -807,6 +976,25 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
++dnl -----------------
++dnl make ADAFLAGS consistent with CFLAGS
++AC_DEFUN([CF_FIXUP_ADAFLAGS],[
++       AC_MSG_CHECKING(optimization options for ADAFLAGS)
++       case "$CFLAGS" in
++       *-g*)
++               CF_ADD_ADAFLAGS(-g)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
++               CF_ADD_ADAFLAGS($cf_O_flag)
++               ;;
++       esac
++       AC_MSG_RESULT($ADAFLAGS)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
+ dnl -----------------
+ dnl Test for availability of useful gcc __attribute__ directives to quiet
+@@ -931,7 +1119,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+ 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:
+@@ -954,6 +1142,7 @@
+ [
+ AC_REQUIRE([CF_GCC_VERSION])
+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ 
+ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "${as_me:-configure}"
+@@ -1029,6 +1218,13 @@
+                                        continue;;
+                                esac
+                                ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [[12]].*)
++                                       CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
++                                       continue;;
++                               esac
++                               ;;
+                        esac
+                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+                fi
+@@ -1070,53 +1266,6 @@
  AC_SUBST(cf_generic_objects)
  ])dnl
@@ -222 +384 @@
  dnl --------------------
  dnl Check if the gnat pragma "Unreferenced" works.
-@@ -1253,6 +1277,53 @@
+@@ -1253,6 +1402,53 @@
  AC_SUBST(USE_GNAT_LIBRARIES)
  ])dnl
@@ -276 +438 @@
  dnl ----------------
  dnl Verify that a test program compiles/links with GNAT.
-@@ -1311,7 +1382,7 @@
+@@ -1311,7 +1507,7 @@
  rm -rf conftest* *~conftest*
  ])dnl
@@ -285 +447 @@
  dnl Verify version of GNAT.
  AC_DEFUN([CF_GNAT_VERSION],
-@@ -1323,7 +1394,7 @@
+@@ -1323,7 +1519,7 @@
  AC_MSG_RESULT($cf_gnat_version)
  
@@ -294 +456 @@
         ;;
  *)
-@@ -1518,7 +1589,7 @@
+@@ -1518,7 +1714,7 @@
  ])
  ])
@@ -303 +465 @@
  dnl For the given system and compiler, find the compiler flags to pass to the
  dnl loader to use the "rpath" feature.
-@@ -1539,10 +1610,10 @@
+@@ -1539,10 +1735,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -316 +478 @@
         ;;
  netbsd*) #(vi
-@@ -1601,11 +1672,11 @@
+@@ -1601,11 +1797,11 @@
  $1="$cf_library_path_list [$]$1"
  ])dnl
@@ -330 +492 @@
         case $cf_cv_system_name in #(vi
         OS/2*|os2*) #(vi
-@@ -1655,7 +1726,7 @@
+@@ -1655,7 +1851,7 @@
  ])
  ])
  dnl ---------------------------------------------------------------------------
 -dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04
++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07
  dnl -------------
  dnl Compute the library file-suffix from the given model name
  dnl $1 = model name
-@@ -1684,7 +1755,7 @@
+@@ -1684,11 +1880,11 @@
                 ;;
         shared) #(vi
@@ -348 +510 @@
                         $3=[$]$2
                         ;;
-@@ -2141,7 +2212,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        $2='.dll'
+                        $3='.dll.a'
+                        ;;
+@@ -1974,7 +2170,7 @@
+ test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
+ 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).
+@@ -2016,9 +2212,11 @@
+ }
+ ],[cf_cv_func_mkstemp=yes
+ ],[cf_cv_func_mkstemp=no
+-],[AC_CHECK_FUNC(mkstemp)
+-])
++],[cf_cv_func_mkstemp=maybe])
+ ])
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       AC_CHECK_FUNC(mkstemp)
++fi
+ if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
+        AC_DEFINE(HAVE_MKSTEMP)
+ fi
+@@ -2141,7 +2339,7 @@
         ,[$1=no])
  ])dnl
@@ -357 +547 @@
  dnl Tie together the configure-script macros for ncurses.
  dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-@@ -2153,7 +2224,10 @@
+@@ -2153,7 +2351,10 @@
  cf_ncuconfig_root=ifelse($1,,ncurses,$1)
  
@@ -369 +559 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -2546,7 +2620,7 @@
+@@ -2509,7 +2710,7 @@
+        AC_SUBST(PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
+ 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
+@@ -2529,7 +2730,7 @@
+   ;;
+ .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
+   ;;
+-.\[$]{*prefix}*) #(vi
++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
+   eval $1="[$]$1"
+   case ".[$]$1" in #(vi
+   .NONE/*)
+@@ -2546,7 +2747,7 @@
  esac
  ])dnl
@@ -378 +586 @@
  dnl Check for the package-config program, unless disabled by command-line.
  AC_DEFUN([CF_PKG_CONFIG],
-@@ -2563,7 +2637,9 @@
+@@ -2563,7 +2764,9 @@
         PKG_CONFIG=none
         ;;
@@ -389 +597 @@
  *)
         PKG_CONFIG=$withval
-@@ -2746,7 +2822,7 @@
+@@ -2746,7 +2949,7 @@
  test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
  ])dnl
@@ -398 +606 @@
  dnl Check for gnatmake, ensure that it is complete.
  AC_DEFUN([CF_PROG_GNAT],[
-@@ -2754,6 +2830,7 @@
+@@ -2754,6 +2957,7 @@
  AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
  if test "$ac_cv_prog_gnat_exists" = no; then
@@ -406 +614 @@
     CF_GNAT_VERSION
     AC_CHECK_PROG(M4_exists, m4, yes, no)
-@@ -2831,7 +2908,7 @@
+@@ -2831,7 +3035,7 @@
  $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
-+dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39
++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
  dnl --------------
  dnl --------------
  dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -2906,10 +2983,14 @@
+@@ -2906,10 +3110,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -432 +640 @@
                 ;;
         beos*) #(vi
-@@ -2962,9 +3043,19 @@
+@@ -2962,9 +3170,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -453 +661 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -2981,18 +3072,18 @@
+@@ -2981,18 +3199,39 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -464 +672 @@
                 ;;
 -       openbsd[[2-9]].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\[$]1
++               IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \[$]SHARED_LIB
++               ** IMPORT_LIB \[$]IMPORT_LIB
++EOF
++               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[[2-9]].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -475 +704 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                 CF_SHARED_SONAME
-@@ -3003,12 +3094,12 @@
+@@ -3003,12 +3242,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -491 +720 @@
                 CF_SHARED_SONAME
                 MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
-@@ -3018,7 +3109,7 @@
+@@ -3018,7 +3257,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -500 +729 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -3123,9 +3214,9 @@
+@@ -3123,9 +3362,12 @@
                 ;;
         esac
@@ -510 +739 @@
 +       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}"
++
++       CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
++       CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
  
         AC_SUBST(CC_SHARED_OPTS)
         AC_SUBST(LD_RPATH_OPT)
-@@ -3137,6 +3228,7 @@
+@@ -3137,6 +3379,7 @@
         AC_SUBST(LOCAL_LDFLAGS)
         AC_SUBST(LOCAL_LDFLAGS2)
@@ -521 +753 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
-@@ -3253,6 +3345,45 @@
+@@ -3253,6 +3496,45 @@
  AC_SUBST(top_builddir)
  ])dnl
@@ -567 +799 @@
  dnl --------
  dnl Make an uppercase version of a variable
-@@ -3415,6 +3546,32 @@
+@@ -3415,6 +3697,32 @@
  fi
  ])dnl
@@ -600 +832 @@
  dnl ------------
  dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-@@ -3436,7 +3593,50 @@
+@@ -3436,7 +3744,50 @@
  AC_SUBST($3)dnl
  ])dnl
@@ -652 +884 @@
  dnl Check for POSIX thread library.
  AC_DEFUN([CF_WITH_PTHREAD],
-@@ -3452,28 +3652,33 @@
+@@ -3452,28 +3803,33 @@
      AC_CHECK_HEADER(pthread.h,[
          AC_DEFINE(HAVE_PTHREADS_H)
@@ -700 +932 @@
  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,
-@@ -3489,7 +3694,7 @@
+@@ -3489,7 +3845,7 @@
  cf_xopen_source=
  
@@ -709 +941 @@
         ;;
  cygwin) #(vi
-@@ -3500,6 +3705,7 @@
+@@ -3500,6 +3856,7 @@
         ;;
  darwin*) #(vi
@@ -717 +949 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -3517,15 +3723,23 @@
+@@ -3517,15 +3874,23 @@
         ;;
  irix[[56]].*) #(vi
@@ -743 +975 @@
  openbsd*) #(vi
         # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -3539,36 +3753,11 @@
+@@ -3539,36 +3904,11 @@
  sco*) #(vi
         # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
@@ -782 +1014 @@
         ;;
  esac
-@@ -3576,4 +3765,33 @@
+@@ -3576,4 +3916,33 @@
  if test -n "$cf_xopen_source" ; then
         CF_ADD_CFLAGS($cf_xopen_source)
@@ -817 +1049 @@
  ])
 diff -Naur ncurses-5.9.orig/Ada95/configure ncurses-5.9/Ada95/configure
---- ncurses-5.9.orig/Ada95/configure    2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/configure 2012-02-16 18:25:13.179823762 +0000
-@@ -1,5 +1,5 @@
+--- ncurses-5.9.orig/Ada95/configure    2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/Ada95/configure 2012-08-25 19:58:02.283220646 +0000
+@@ -1,7 +1,7 @@
  #! /bin/sh
 -# From configure.in Revision: 1.30 .
-+# From configure.in Revision: 1.38 .
++# From configure.in Revision: 1.41 .
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20101002.
+-# Generated by Autoconf 2.52.20101002.
++# Generated by Autoconf 2.52.20120811.
  #
-@@ -645,6 +645,7 @@
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+@@ -135,15 +135,16 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++infodir='${datarootdir}/info'
++mandir='${datarootdir}/man'
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -194,6 +195,13 @@
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -469,7 +477,7 @@
+ done
+ 
+ # Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
+               localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+@@ -606,15 +614,16 @@
+   --bindir=DIR            user executables [EPREFIX/bin]
+   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR        program executables [EPREFIX/libexec]
+-  --datadir=DIR           read-only architecture-independent data [PREFIX/share]
++  --datarootdir=DIR       read-only architecture-independent data [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --infodir=DIR           info documentation [PREFIX/info]
+-  --mandir=DIR            man documentation [PREFIX/man]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
+ EOF
+ 
+   cat <<\EOF
+@@ -645,6 +654,7 @@
  
    --with-system-type=XXX  test: override derived host system-type
@@ -834 +1132 @@
    --without-tests         suppress build with test-programs
    --enable-mixed-case     tic should assume mixed-case filenames
-@@ -660,6 +661,7 @@
+@@ -660,6 +670,7 @@
    --with-shared           generate shared C-objects (needed for --with-ada-sharedlib)
    --enable-widec          compile with wide-char/UTF-8 code
@@ -842 +1140 @@
    --enable-rpath-link     link sample programs with rpath option
  Fine-Tuning Your Configuration:
-@@ -881,7 +883,7 @@
+@@ -677,7 +688,7 @@
+   --enable-reentrant      compile with experimental reentrant code
+   --with-wrap-prefix=XXX  override prefix used for public variables
+ Testing/development Options:
+-  --enable-echo           build: display "compiling" commands (default)
++  --disable-echo          display "compiling" commands
+   --enable-warnings       build: turn on GCC compiler warnings
+   --enable-assertions     test: turn on generation of assertion code
+   --enable-expanded       test: generate functions for certain macros
+@@ -757,7 +768,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20101002.  Invocation command line was
++generated by GNU Autoconf 2.52.20120811.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -881,7 +892,7 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:884: loading site script $ac_site_file" >&5
-+    { echo "$as_me:886: loading site script $ac_site_file" >&5
++    { echo "$as_me:895: 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"
-@@ -892,7 +894,7 @@
+@@ -892,7 +903,7 @@
    # 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:895: loading cache $cache_file" >&5
-+    { echo "$as_me:897: loading cache $cache_file" >&5
++    { echo "$as_me:906: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -900,7 +902,7 @@
+@@ -900,7 +911,7 @@
      esac
    fi
  else
 -  { echo "$as_me:903: creating cache $cache_file" >&5
-+  { echo "$as_me:905: creating cache $cache_file" >&5
++  { echo "$as_me:914: creating cache $cache_file" >&5
  echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -916,21 +918,21 @@
+@@ -916,21 +927,21 @@
    eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:919: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:921: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:930: 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:923: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:925: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:934: 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=: ;;
@@ -886 +1202 @@
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -        { echo "$as_me:929: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:931: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:940: 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:931:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:933:   former value:  $ac_old_val" >&5
++        { echo "$as_me:942:   former value:  $ac_old_val" >&5
  echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:933:   current value: $ac_new_val" >&5
-+        { echo "$as_me:935:   current value: $ac_new_val" >&5
++        { echo "$as_me:944:   current value: $ac_new_val" >&5
  echo "$as_me:   current value: $ac_new_val" >&2;}
          ac_cache_corrupted=:
        fi;;
-@@ -949,9 +951,9 @@
+@@ -949,9 +960,9 @@
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:952: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:954: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:963: 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:954: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:956: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:965: 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
-@@ -972,10 +974,10 @@
+@@ -972,10 +983,10 @@
  echo "#! $SHELL" >conftest.sh
  echo  "exit 0"   >>conftest.sh
  chmod +x conftest.sh
 -if { (echo "$as_me:975: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:977: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
    (PATH=".;."; conftest.sh) 2>&5
    ac_status=$?
 -  echo "$as_me:978: \$? = $ac_status" >&5
-+  echo "$as_me:980: \$? = $ac_status" >&5
++  echo "$as_me:989: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    ac_path_separator=';'
  else
-@@ -1005,7 +1007,7 @@
+@@ -1005,7 +1016,7 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:1008: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1010: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1019: 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
-@@ -1015,11 +1017,11 @@
+@@ -1015,11 +1026,11 @@
  
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:1018: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1020: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:1022: checking build system type" >&5
-+echo "$as_me:1024: checking build system type" >&5
++echo "$as_me:1033: 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
-@@ -1028,23 +1030,23 @@
+@@ -1028,23 +1039,23 @@
  test -z "$ac_cv_build_alias" &&
    ac_cv_build_alias=`$ac_config_guess`
  test -z "$ac_cv_build_alias" &&
 -  { { echo "$as_me:1031: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1033: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1042: error: cannot guess build type; you must specify one" >&5
  echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
  ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 -  { { echo "$as_me:1035: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1037: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1046: 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; }; }
@@ -960 +1276 @@
  fi
 -echo "$as_me:1040: result: $ac_cv_build" >&5
-+echo "$as_me:1042: result: $ac_cv_build" >&5
++echo "$as_me:1051: result: $ac_cv_build" >&5
  echo "${ECHO_T}$ac_cv_build" >&6
  build=$ac_cv_build
@@ -968 +1284 @@
  
 -echo "$as_me:1047: checking host system type" >&5
-+echo "$as_me:1049: checking host system type" >&5
++echo "$as_me:1058: 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
-@@ -1053,12 +1055,12 @@
+@@ -1053,12 +1064,12 @@
  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:1056: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1058: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1067: 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; }; }
@@ -983 +1299 @@
  fi
 -echo "$as_me:1061: result: $ac_cv_host" >&5
-+echo "$as_me:1063: result: $ac_cv_host" >&5
++echo "$as_me:1072: result: $ac_cv_host" >&5
  echo "${ECHO_T}$ac_cv_host" >&6
  host=$ac_cv_host
  host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1066,7 +1068,7 @@
+@@ -1066,7 +1077,7 @@
  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:1069: checking target system type" >&5
-+       echo "$as_me:1071: checking target system type" >&5
++       echo "$as_me:1080: 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
-@@ -1075,12 +1077,12 @@
+@@ -1075,12 +1086,12 @@
  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:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1080: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1089: 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; }; }
@@ -1007 +1323 @@
  fi
 -echo "$as_me:1083: result: $ac_cv_target" >&5
-+echo "$as_me:1085: result: $ac_cv_target" >&5
++echo "$as_me:1094: result: $ac_cv_target" >&5
  echo "${ECHO_T}$ac_cv_target" >&6
  target=$ac_cv_target
  target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1111,13 +1113,13 @@
+@@ -1111,13 +1122,13 @@
  fi
  
  test -z "$system_name" && system_name="$cf_cv_system_name"
 -test -n "$cf_cv_system_name" && echo "$as_me:1114: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1116: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1125: 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 "$as_me:1118: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+       echo "$as_me:1120: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++       echo "$as_me:1129: 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 "$as_me:1120: error: \"Please remove config.cache and try again.\"" >&5
-+       { { echo "$as_me:1122: error: \"Please remove config.cache and try again.\"" >&5
++       { { echo "$as_me:1131: 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
-@@ -1125,7 +1127,7 @@
+@@ -1125,7 +1136,7 @@
  # 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:1128: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1130: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1139: WARNING: overriding system type to $withval" >&5
  echo "$as_me: WARNING: overriding system type to $withval" >&2;}
   cf_cv_system_name=$withval
  fi;
-@@ -1135,23 +1137,23 @@
+@@ -1135,23 +1146,23 @@
  
  ###    Default install-location
  
 -echo "$as_me:1138: checking for prefix" >&5
-+echo "$as_me:1140: checking for prefix" >&5
++echo "$as_me:1149: checking for prefix" >&5
  echo $ECHO_N "checking for prefix... $ECHO_C" >&6
  if test "x$prefix" = "xNONE" ; then
@@ -1056 +1372 @@
  fi
 -echo "$as_me:1150: result: $prefix" >&5
-+echo "$as_me:1152: result: $prefix" >&5
++echo "$as_me:1161: result: $prefix" >&5
  echo "${ECHO_T}$prefix" >&6
  
  if test "x$prefix" = "xNONE" ; then
 -echo "$as_me:1154: checking for default include-directory" >&5
-+echo "$as_me:1156: checking for default include-directory" >&5
++echo "$as_me:1165: 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 \
-@@ -1174,7 +1176,7 @@
+@@ -1174,7 +1185,7 @@
         fi
         test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
  done
 -echo "$as_me:1177: result: $includedir" >&5
-+echo "$as_me:1179: result: $includedir" >&5
++echo "$as_me:1188: result: $includedir" >&5
  echo "${ECHO_T}$includedir" >&6
  fi
  
-@@ -1188,7 +1190,7 @@
+@@ -1186,213 +1197,11 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 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
+-  # 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:1191: checking for $ac_word" >&5
-+echo "$as_me:1193: 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
-@@ -1203,7 +1205,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-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
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
 -echo "$as_me:1206: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1208: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1211,10 +1213,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1214: result: $CC" >&5
-+  echo "$as_me:1216: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1217: result: no" >&5
-+  echo "$as_me:1219: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1223,7 +1225,7 @@
-   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 "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-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
 -echo "$as_me:1226: checking for $ac_word" >&5
-+echo "$as_me:1228: 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
-@@ -1238,7 +1240,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="gcc"
+-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
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="gcc"
 -echo "$as_me:1241: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1243: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1246,10 +1248,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1249: result: $ac_ct_CC" >&5
-+  echo "$as_me:1251: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1252: result: no" >&5
-+  echo "$as_me:1254: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1262,7 +1264,7 @@
-   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 "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-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
 -echo "$as_me:1265: checking for $ac_word" >&5
-+echo "$as_me:1267: 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
-@@ -1277,7 +1279,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}cc"
+-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
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
 -echo "$as_me:1280: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1282: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1285,10 +1287,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1288: result: $CC" >&5
-+  echo "$as_me:1290: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1291: result: no" >&5
-+  echo "$as_me:1293: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1297,7 +1299,7 @@
-   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 "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-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
 -echo "$as_me:1300: checking for $ac_word" >&5
-+echo "$as_me:1302: 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
-@@ -1312,7 +1314,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="cc"
+-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
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="cc"
 -echo "$as_me:1315: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1317: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1320,10 +1322,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1323: result: $ac_ct_CC" >&5
-+  echo "$as_me:1325: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1326: result: no" >&5
-+  echo "$as_me:1328: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1336,7 +1338,7 @@
- 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 "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-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
 -echo "$as_me:1339: checking for $ac_word" >&5
-+echo "$as_me:1341: 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
-@@ -1356,7 +1358,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
+-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
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-  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
+-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-  ac_prog_rejected=yes
+-  continue
+-fi
+-ac_cv_prog_CC="cc"
 -echo "$as_me:1359: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1361: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1378,10 +1380,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-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
+-  if test $# != 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+-    shift
+-    ac_cv_prog_CC="$@"
+-  fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1381: result: $CC" >&5
-+  echo "$as_me:1383: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1384: result: no" >&5
-+  echo "$as_me:1386: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1392,7 +1394,7 @@
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  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:1395: checking for $ac_word" >&5
-+echo "$as_me:1397: checking for $ac_word" >&5
++echo "$as_me:1204: 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
-@@ -1407,7 +1409,7 @@
+@@ -1407,7 +1216,7 @@
    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:1410: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1412: found $ac_dir/$ac_word" >&5
++echo "$as_me:1219: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1415,10 +1417,10 @@
+@@ -1415,10 +1224,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1418: result: $CC" >&5
-+  echo "$as_me:1420: result: $CC" >&5
++  echo "$as_me:1227: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1421: result: no" >&5
-+  echo "$as_me:1423: result: no" >&5
++  echo "$as_me:1230: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1431,7 +1433,7 @@
+@@ -1427,11 +1236,11 @@
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in gnatgcc gcc cc
  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:1434: checking for $ac_word" >&5
-+echo "$as_me:1436: checking for $ac_word" >&5
++echo "$as_me:1243: 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
-@@ -1446,7 +1448,7 @@
+@@ -1446,7 +1255,7 @@
    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:1449: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1451: found $ac_dir/$ac_word" >&5
++echo "$as_me:1258: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1454,10 +1456,10 @@
+@@ -1454,10 +1263,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1457: result: $ac_ct_CC" >&5
-+  echo "$as_me:1459: result: $ac_ct_CC" >&5
++  echo "$as_me:1266: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1460: result: no" >&5
-+  echo "$as_me:1462: result: no" >&5
++  echo "$as_me:1269: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1469,32 +1471,32 @@
- 
- fi
- 
+@@ -1467,34 +1276,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-fi
+-
 -test -z "$CC" && { { echo "$as_me:1472: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1474: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1279: error: no acceptable cc found in \$PATH" >&5
  echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
@@ -1302 +1677 @@
  # Provide some information about the compiler.
 -echo "$as_me:1477:" \
-+echo "$as_me:1479:" \
++echo "$as_me:1284:" \
       "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:1480: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1482: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1287: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1483: \$? = $ac_status" >&5
-+  echo "$as_me:1485: \$? = $ac_status" >&5
++  echo "$as_me:1290: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1485: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1487: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1292: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1488: \$? = $ac_status" >&5
-+  echo "$as_me:1490: \$? = $ac_status" >&5
++  echo "$as_me:1295: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1490: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1492: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1297: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1493: \$? = $ac_status" >&5
-+  echo "$as_me:1495: \$? = $ac_status" >&5
++  echo "$as_me:1300: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 1497 "configure"
-+#line 1499 "configure"
++#line 1304 "configure"
  #include "confdefs.h"
  
  int
-@@ -1510,13 +1512,13 @@
+@@ -1510,13 +1317,13 @@
  # 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:1513: checking for C compiler default output" >&5
-+echo "$as_me:1515: checking for C compiler default output" >&5
++echo "$as_me:1320: checking for C compiler default output" >&5
  echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 -if { (eval echo "$as_me:1516: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1518: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1323: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
 -  echo "$as_me:1519: \$? = $ac_status" >&5
-+  echo "$as_me:1521: \$? = $ac_status" >&5
++  echo "$as_me:1326: \$? = $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
-@@ -1539,34 +1541,34 @@
+@@ -1539,34 +1346,34 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1542: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1544: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1349: error: C compiler cannot create executables" >&5
  echo "$as_me: error: C compiler cannot create executables" >&2;}
     { (exit 77); exit 77; }; }
@@ -1362 +1737 @@
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:1548: result: $ac_file" >&5
-+echo "$as_me:1550: result: $ac_file" >&5
++echo "$as_me:1355: result: $ac_file" >&5
  echo "${ECHO_T}$ac_file" >&6
  
@@ -1368 +1743 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1553: checking whether the C compiler works" >&5
-+echo "$as_me:1555: checking whether the C compiler works" >&5
++echo "$as_me:1360: 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
@@ -1375 +1750 @@
    if { ac_try='./$ac_file'
 -  { (eval echo "$as_me:1559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1366: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1562: \$? = $ac_status" >&5
-+  echo "$as_me:1564: \$? = $ac_status" >&5
++  echo "$as_me:1369: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
@@ -1387 +1762 @@
      else
 -       { { echo "$as_me:1569: error: cannot run C compiled programs.
-+       { { echo "$as_me:1571: error: cannot run C compiled programs.
++       { { echo "$as_me:1376: 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;}
-@@ -1574,24 +1576,24 @@
+@@ -1574,24 +1381,24 @@
      fi
    fi
  fi
 -echo "$as_me:1577: result: yes" >&5
-+echo "$as_me:1579: result: yes" >&5
++echo "$as_me:1384: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
@@ -1404 +1779 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1584: checking whether we are cross compiling" >&5
-+echo "$as_me:1586: checking whether we are cross compiling" >&5
++echo "$as_me:1391: checking whether we are cross compiling" >&5
  echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:1586: result: $cross_compiling" >&5
-+echo "$as_me:1588: result: $cross_compiling" >&5
++echo "$as_me:1393: result: $cross_compiling" >&5
  echo "${ECHO_T}$cross_compiling" >&6
  
 -echo "$as_me:1589: checking for executable suffix" >&5
-+echo "$as_me:1591: checking for executable suffix" >&5
++echo "$as_me:1396: checking for executable suffix" >&5
  echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 -if { (eval echo "$as_me:1591: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1593: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1398: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:1594: \$? = $ac_status" >&5
-+  echo "$as_me:1596: \$? = $ac_status" >&5
++  echo "$as_me:1401: \$? = $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
-@@ -1607,25 +1609,25 @@
+@@ -1607,25 +1414,25 @@
    esac
  done
  else
 -  { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1612: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1417: 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; }; }
@@ -1434 +1809 @@
  rm -f conftest$ac_cv_exeext
 -echo "$as_me:1616: result: $ac_cv_exeext" >&5
-+echo "$as_me:1618: result: $ac_cv_exeext" >&5
++echo "$as_me:1423: result: $ac_cv_exeext" >&5
  echo "${ECHO_T}$ac_cv_exeext" >&6
  
@@ -1441 +1816 @@
  ac_exeext=$EXEEXT
 -echo "$as_me:1622: checking for object suffix" >&5
-+echo "$as_me:1624: checking for object suffix" >&5
++echo "$as_me:1429: checking for object suffix" >&5
  echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
  if test "${ac_cv_objext+set}" = set; then
@@ -1448 +1823 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1628 "configure"
-+#line 1630 "configure"
++#line 1435 "configure"
  #include "confdefs.h"
  
  int
-@@ -1637,10 +1639,10 @@
+@@ -1637,10 +1444,10 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1447: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1643: \$? = $ac_status" >&5
-+  echo "$as_me:1645: \$? = $ac_status" >&5
++  echo "$as_me:1450: \$? = $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
-@@ -1652,24 +1654,24 @@
+@@ -1652,24 +1459,24 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1655: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1657: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1462: error: cannot compute OBJEXT: cannot compile" >&5
  echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
     { (exit 1); exit 1; }; }
@@ -1478 +1853 @@
  fi
 -echo "$as_me:1662: result: $ac_cv_objext" >&5
-+echo "$as_me:1664: result: $ac_cv_objext" >&5
++echo "$as_me:1469: result: $ac_cv_objext" >&5
  echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:1666: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1668: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1473: 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
@@ -1490 +1865 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1672 "configure"
-+#line 1674 "configure"
++#line 1479 "configure"
  #include "confdefs.h"
  
  int
-@@ -1684,16 +1686,16 @@
+@@ -1684,16 +1491,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1494: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1690: \$? = $ac_status" >&5
-+  echo "$as_me:1692: \$? = $ac_status" >&5
++  echo "$as_me:1497: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1693: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1500: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1696: \$? = $ac_status" >&5
-+  echo "$as_me:1698: \$? = $ac_status" >&5
++  echo "$as_me:1503: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -1705,19 +1707,19 @@
+@@ -1705,19 +1512,19 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1710: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1515: result: $ac_cv_c_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -1527 +1902 @@
  CFLAGS="-g"
 -echo "$as_me:1714: checking whether $CC accepts -g" >&5
-+echo "$as_me:1716: checking whether $CC accepts -g" >&5
++echo "$as_me:1521: 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
@@ -1534 +1909 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1720 "configure"
-+#line 1722 "configure"
++#line 1527 "configure"
  #include "confdefs.h"
  
  int
-@@ -1729,16 +1731,16 @@
+@@ -1729,16 +1536,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1539: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1735: \$? = $ac_status" >&5
-+  echo "$as_me:1737: \$? = $ac_status" >&5
++  echo "$as_me:1542: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1738: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1545: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1741: \$? = $ac_status" >&5
-+  echo "$as_me:1743: \$? = $ac_status" >&5
++  echo "$as_me:1548: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
-@@ -1748,7 +1750,7 @@
+@@ -1748,7 +1555,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:1751: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1753: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1558: 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
-@@ -1775,16 +1777,16 @@
+@@ -1775,16 +1582,16 @@
  #endif
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1585: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1781: \$? = $ac_status" >&5
-+  echo "$as_me:1783: \$? = $ac_status" >&5
++  echo "$as_me:1588: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1591: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1787: \$? = $ac_status" >&5
-+  echo "$as_me:1789: \$? = $ac_status" >&5
++  echo "$as_me:1594: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
     ''\
-@@ -1796,7 +1798,7 @@
+@@ -1796,7 +1603,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1799 "configure"
-+#line 1801 "configure"
++#line 1606 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -1809,16 +1811,16 @@
+@@ -1809,16 +1616,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1815: \$? = $ac_status" >&5
-+  echo "$as_me:1817: \$? = $ac_status" >&5
++  echo "$as_me:1622: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1818: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1625: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1821: \$? = $ac_status" >&5
-+  echo "$as_me:1823: \$? = $ac_status" >&5
++  echo "$as_me:1628: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -1828,7 +1830,7 @@
+@@ -1828,7 +1635,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1831 "configure"
-+#line 1833 "configure"
++#line 1638 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -1840,16 +1842,16 @@
+@@ -1840,16 +1647,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1845: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1650: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1846: \$? = $ac_status" >&5
-+  echo "$as_me:1848: \$? = $ac_status" >&5
++  echo "$as_me:1653: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1656: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1852: \$? = $ac_status" >&5
-+  echo "$as_me:1854: \$? = $ac_status" >&5
++  echo "$as_me:1659: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -1879,11 +1881,11 @@
+@@ -1879,11 +1686,11 @@
  
  GCC_VERSION=none
  if test "$GCC" = yes ; then
 -       echo "$as_me:1882: checking version of $CC" >&5
-+       echo "$as_me:1884: checking version of $CC" >&5
++       echo "$as_me:1689: 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/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
         test -z "$GCC_VERSION" && GCC_VERSION=unknown
 -       echo "$as_me:1886: result: $GCC_VERSION" >&5
-+       echo "$as_me:1888: result: $GCC_VERSION" >&5
++       echo "$as_me:1693: result: $GCC_VERSION" >&5
  echo "${ECHO_T}$GCC_VERSION" >&6
  fi
  
-@@ -1893,7 +1895,7 @@
+@@ -1893,7 +1700,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
 -echo "$as_me:1896: checking how to run the C preprocessor" >&5
-+echo "$as_me:1898: checking how to run the C preprocessor" >&5
++echo "$as_me:1703: 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
-@@ -1914,18 +1916,18 @@
+@@ -1914,18 +1721,18 @@
    # 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 1917 "configure"
-+#line 1919 "configure"
++#line 1724 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -1683 +2058 @@
  _ACEOF
 -if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1690 +2065 @@
    cat conftest.err >&5
 -  echo "$as_me:1928: \$? = $ac_status" >&5
-+  echo "$as_me:1930: \$? = $ac_status" >&5
++  echo "$as_me:1735: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1948,17 +1950,17 @@
+@@ -1948,17 +1755,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1951 "configure"
-+#line 1953 "configure"
++#line 1758 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1762: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1711 +2086 @@
    cat conftest.err >&5
 -  echo "$as_me:1961: \$? = $ac_status" >&5
-+  echo "$as_me:1963: \$? = $ac_status" >&5
++  echo "$as_me:1768: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1995,7 +1997,7 @@
+@@ -1995,7 +1802,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:1998: result: $CPP" >&5
-+echo "$as_me:2000: result: $CPP" >&5
++echo "$as_me:1805: result: $CPP" >&5
  echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -2005,18 +2007,18 @@
+@@ -2005,18 +1812,18 @@
    # 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 2008 "configure"
-+#line 2010 "configure"
++#line 1815 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -1735 +2110 @@
  _ACEOF
 -if { (eval echo "$as_me:2013: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1742 +2117 @@
    cat conftest.err >&5
 -  echo "$as_me:2019: \$? = $ac_status" >&5
-+  echo "$as_me:2021: \$? = $ac_status" >&5
++  echo "$as_me:1826: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2039,17 +2041,17 @@
+@@ -2039,17 +1846,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2042 "configure"
-+#line 2044 "configure"
++#line 1849 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2046: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2048: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1853: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1763 +2138 @@
    cat conftest.err >&5
 -  echo "$as_me:2052: \$? = $ac_status" >&5
-+  echo "$as_me:2054: \$? = $ac_status" >&5
++  echo "$as_me:1859: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2077,7 +2079,7 @@
+@@ -2077,7 +1884,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2082: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:1887: error: C preprocessor \"$CPP\" fails sanity check" >&5
  echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -2090,14 +2092,14 @@
+@@ -2090,14 +1897,14 @@
  ac_main_return=return
  
  if test $ac_cv_c_compiler_gnu = yes; then
 -    echo "$as_me:2093: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2095: checking whether $CC needs -traditional" >&5
++    echo "$as_me:1900: 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
@@ -1789 +2164 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2100 "configure"
-+#line 2102 "configure"
++#line 1907 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  int Autoconf = TIOCGETP;
-@@ -2112,7 +2114,7 @@
+@@ -2112,7 +1919,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat >conftest.$ac_ext <<_ACEOF
 -#line 2115 "configure"
-+#line 2117 "configure"
++#line 1922 "configure"
  #include "confdefs.h"
  #include <termio.h>
  int Autoconf = TCGETA;
-@@ -2125,14 +2127,14 @@
+@@ -2125,14 +1932,14 @@
  
    fi
  fi
 -echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2130: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:1935: 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
@@ -1815 +2190 @@
  
 -echo "$as_me:2135: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2137: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:1942: 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
-@@ -2148,15 +2150,15 @@
+@@ -2148,15 +1955,15 @@
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 -if { (eval echo "$as_me:2151: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2153: \"$ac_try\"") >&5
++if { (eval echo "$as_me:1958: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2154: \$? = $ac_status" >&5
-+  echo "$as_me:2156: \$? = $ac_status" >&5
++  echo "$as_me:1961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -  test -f conftest2.$ac_objext && { (eval echo "$as_me:2156: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2158: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:1963: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2159: \$? = $ac_status" >&5
-+  echo "$as_me:2161: \$? = $ac_status" >&5
++  echo "$as_me:1966: \$? = $ac_status" >&5
    (exit $ac_status); };
  then
    eval cf_cv_prog_CC_c_o=yes
-@@ -2167,19 +2169,19 @@
+@@ -2167,19 +1974,19 @@
  
  fi
  if test $cf_cv_prog_CC_c_o = yes; then
 -  echo "$as_me:2170: result: yes" >&5
-+  echo "$as_me:2172: result: yes" >&5
++  echo "$as_me:1977: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:2173: result: no" >&5
-+  echo "$as_me:2175: result: no" >&5
++  echo "$as_me:1980: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:2177: checking for POSIXized ISC" >&5
-+echo "$as_me:2179: checking for POSIXized ISC" >&5
++echo "$as_me:1984: checking for POSIXized ISC" >&5
  echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
  if test -d /etc/conf/kconfig.d &&
@@ -1859 +2234 @@
  then
 -  echo "$as_me:2182: result: yes" >&5
-+  echo "$as_me:2184: result: yes" >&5
++  echo "$as_me:1989: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    ISC=yes # If later tests want to check for ISC.
  
-@@ -2193,12 +2195,115 @@
+@@ -2193,12 +2000,115 @@
      CC="$CC -Xp"
    fi
  else
 -  echo "$as_me:2196: result: no" >&5
-+  echo "$as_me:2198: result: no" >&5
++  echo "$as_me:2003: result: no" >&5
  echo "${ECHO_T}no" >&6
    ISC=
@@ -1880 +2255 @@
 +# into CC.  This will not help with broken scripts that wrap the compiler with
 +# options, but eliminates a more common category of user confusion.
-+echo "$as_me:2209: checking \$CC variable" >&5
++echo "$as_me:2014: checking \$CC variable" >&5
 +echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 +case "$CC" in #(vi
 +*[\ \  ]-[IUD]*)
-+       echo "$as_me:2213: result: broken" >&5
++       echo "$as_me:2018: result: broken" >&5
 +echo "${ECHO_T}broken" >&6
-+       { echo "$as_me:2215: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++       { echo "$as_me:2020: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 +echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 +       # humor him...
@@ -1972 +2347 @@
 +       ;;
 +*)
-+       echo "$as_me:2301: result: ok" >&5
++       echo "$as_me:2106: result: ok" >&5
 +echo "${ECHO_T}ok" >&6
 +       ;;
 +esac
 +
-+echo "$as_me:2306: checking for ${CC:-cc} option to accept ANSI C" >&5
++echo "$as_me:2111: checking for ${CC:-cc} option to accept ANSI C" >&5
  echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
  if test "${cf_cv_ansi_cc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2302,7 +2407,7 @@
+@@ -2302,7 +2212,7 @@
  fi
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2305 "configure"
-+#line 2410 "configure"
++#line 2215 "configure"
  #include "confdefs.h"
  
  #ifndef CC_HAS_PROTOS
-@@ -2323,16 +2428,16 @@
+@@ -2323,16 +2233,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2431: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2236: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2329: \$? = $ac_status" >&5
-+  echo "$as_me:2434: \$? = $ac_status" >&5
++  echo "$as_me:2239: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2332: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2242: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2335: \$? = $ac_status" >&5
-+  echo "$as_me:2440: \$? = $ac_status" >&5
++  echo "$as_me:2245: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ansi_cc="$cf_arg"; break
  else
-@@ -2345,7 +2450,7 @@
+@@ -2345,7 +2255,7 @@
  CPPFLAGS="$cf_save_CPPFLAGS"
  
  fi
 -echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2453: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2258: result: $cf_cv_ansi_cc" >&5
  echo "${ECHO_T}$cf_cv_ansi_cc" >&6
  
  if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2438,7 +2543,7 @@
+@@ -2438,7 +2348,7 @@
  fi
  
  if test "$cf_cv_ansi_cc" = "no"; then
 -       { { echo "$as_me:2441: error: Your compiler does not appear to recognize prototypes.
-+       { { echo "$as_me:2546: error: Your compiler does not appear to recognize prototypes.
++       { { echo "$as_me:2351: error: Your compiler does not appear to recognize prototypes.
  You have the following choices:
         a. adjust your compiler options
         b. get an up-to-date compiler
-@@ -2485,7 +2590,7 @@
+@@ -2485,7 +2395,7 @@
  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:2488: checking for $ac_word" >&5
-+echo "$as_me:2593: checking for $ac_word" >&5
++echo "$as_me:2398: 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
-@@ -2500,7 +2605,7 @@
+@@ -2500,7 +2410,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AWK="$ac_prog"
 -echo "$as_me:2503: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2608: found $ac_dir/$ac_word" >&5
++echo "$as_me:2413: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2508,21 +2613,21 @@
+@@ -2508,21 +2418,21 @@
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
 -  echo "$as_me:2511: result: $AWK" >&5
-+  echo "$as_me:2616: result: $AWK" >&5
++  echo "$as_me:2421: result: $AWK" >&5
  echo "${ECHO_T}$AWK" >&6
  else
 -  echo "$as_me:2514: result: no" >&5
-+  echo "$as_me:2619: result: no" >&5
++  echo "$as_me:2424: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -2064 +2439 @@
  
 -test -z "$AWK" && { { echo "$as_me:2521: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:2626: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:2431: error: No awk program found" >&5
  echo "$as_me: error: No awk program found" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:2525: checking for egrep" >&5
-+echo "$as_me:2630: checking for egrep" >&5
++echo "$as_me:2435: 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
-@@ -2532,11 +2637,11 @@
+@@ -2532,11 +2442,11 @@
      else ac_cv_prog_egrep='egrep'
      fi
  fi
 -echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:2640: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:2445: 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:2539: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:2644: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:2449: error: No egrep program found" >&5
  echo "$as_me: error: No egrep program found" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -2552,7 +2657,7 @@
+@@ -2552,7 +2462,7 @@
  # 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:2555: checking for a BSD compatible install" >&5
-+echo "$as_me:2660: checking for a BSD compatible install" >&5
++echo "$as_me:2465: 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
-@@ -2601,7 +2706,7 @@
+@@ -2601,7 +2511,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
 -echo "$as_me:2604: result: $INSTALL" >&5
-+echo "$as_me:2709: result: $INSTALL" >&5
++echo "$as_me:2514: result: $INSTALL" >&5
  echo "${ECHO_T}$INSTALL" >&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2612,18 +2717,18 @@
+@@ -2612,18 +2522,18 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
 -echo "$as_me:2615: checking whether ln -s works" >&5
-+echo "$as_me:2720: checking whether ln -s works" >&5
++echo "$as_me:2525: 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 "$as_me:2619: result: yes" >&5
-+  echo "$as_me:2724: result: yes" >&5
++  echo "$as_me:2529: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:2622: result: no, using $LN_S" >&5
-+  echo "$as_me:2727: result: no, using $LN_S" >&5
++  echo "$as_me:2532: result: no, using $LN_S" >&5
  echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
 -echo "$as_me:2626: checking if $LN_S -f options work" >&5
-+echo "$as_me:2731: checking if $LN_S -f options work" >&5
++echo "$as_me:2536: 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
-@@ -2635,12 +2740,12 @@
+@@ -2635,12 +2545,12 @@
         cf_prog_ln_sf=no
  fi
  rm -f conf$$.dst conf$$src
 -echo "$as_me:2638: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:2743: result: $cf_prog_ln_sf" >&5
++echo "$as_me:2548: result: $cf_prog_ln_sf" >&5
  echo "${ECHO_T}$cf_prog_ln_sf" >&6
  
@@ -2139 +2514 @@
  
 -echo "$as_me:2643: checking for long file names" >&5
-+echo "$as_me:2748: checking for long file names" >&5
++echo "$as_me:2553: 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
-@@ -2679,7 +2784,7 @@
+@@ -2679,7 +2589,7 @@
    rm -rf $ac_xdir 2>/dev/null
  done
  fi
 -echo "$as_me:2682: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:2787: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:2592: result: $ac_cv_sys_long_file_names" >&5
  echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
  if test $ac_cv_sys_long_file_names = yes; then
  
-@@ -2691,7 +2796,7 @@
+@@ -2691,7 +2601,7 @@
  
  # if we find pkg-config, check if we should install the ".pc" files.
  
 -echo "$as_me:2694: checking if you want to use pkg-config" >&5
-+echo "$as_me:2799: checking if you want to use pkg-config" >&5
++echo "$as_me:2604: 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.
-@@ -2701,7 +2806,7 @@
+@@ -2701,7 +2611,7 @@
  else
    cf_pkg_config=yes
  fi;
 -echo "$as_me:2704: result: $cf_pkg_config" >&5
-+echo "$as_me:2809: result: $cf_pkg_config" >&5
++echo "$as_me:2614: result: $cf_pkg_config" >&5
  echo "${ECHO_T}$cf_pkg_config" >&6
  
  case $cf_pkg_config in #(vi
-@@ -2709,10 +2814,11 @@
+@@ -2709,10 +2619,11 @@
         PKG_CONFIG=none
         ;;
@@ -2180 +2555 @@
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 -echo "$as_me:2715: checking for $ac_word" >&5
-+echo "$as_me:2821: checking for $ac_word" >&5
++echo "$as_me:2626: 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
-@@ -2729,7 +2835,7 @@
+@@ -2729,7 +2640,7 @@
    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:2732: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2838: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2643: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -2740,10 +2846,10 @@
+@@ -2740,10 +2651,10 @@
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  
  if test -n "$PKG_CONFIG"; then
 -  echo "$as_me:2743: result: $PKG_CONFIG" >&5
-+  echo "$as_me:2849: result: $PKG_CONFIG" >&5
++  echo "$as_me:2654: result: $PKG_CONFIG" >&5
  echo "${ECHO_T}$PKG_CONFIG" >&6
  else
 -  echo "$as_me:2746: result: no" >&5
-+  echo "$as_me:2852: result: no" >&5
++  echo "$as_me:2657: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2752,7 +2858,7 @@
+@@ -2752,7 +2663,7 @@
    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:2755: checking for $ac_word" >&5
-+echo "$as_me:2861: checking for $ac_word" >&5
++echo "$as_me:2666: 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
-@@ -2769,7 +2875,7 @@
+@@ -2769,7 +2680,7 @@
    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:2772: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2878: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2683: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -2781,10 +2887,10 @@
+@@ -2781,10 +2692,10 @@
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  
  if test -n "$ac_pt_PKG_CONFIG"; then
 -  echo "$as_me:2784: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:2890: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:2695: result: $ac_pt_PKG_CONFIG" >&5
  echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
  else
 -  echo "$as_me:2787: result: no" >&5
-+  echo "$as_me:2893: result: no" >&5
++  echo "$as_me:2698: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2827,7 +2933,7 @@
+@@ -2815,7 +2726,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval PKG_CONFIG="$PKG_CONFIG"
+   case ".$PKG_CONFIG" in #(vi
+   .NONE/*)
+@@ -2827,7 +2738,7 @@
    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:2830: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+  { { echo "$as_me:2936: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:2741: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
  echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -2836,15 +2942,51 @@
+@@ -2836,35 +2747,100 @@
  fi
  
@@ -2252 +2636 @@
 -       echo "$as_me:2839: 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
-+       echo "$as_me:2945: checking for $PKG_CONFIG library directory" >&5
++       echo "$as_me:2750: checking for $PKG_CONFIG library directory" >&5
 +echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
  
@@ -2260 +2644 @@
 -       fi
 -       PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
+-
+-# Check whether --enable-pc-files or --disable-pc-files was given.
+-if test "${enable_pc_files+set}" = set; then
+-  enableval="$enable_pc_files"
+-  enable_pc_files=$enableval
 +# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
 +if test "${with_pkg_config_libdir+set}" = set; then
 +  withval="$with_pkg_config_libdir"
 +  PKG_CONFIG_LIBDIR=$withval
-+else
+ else
+-  enable_pc_files=no
 +  PKG_CONFIG_LIBDIR=yes
-+fi;
-+
+ fi;
+-               echo "$as_me:2856: result: $enable_pc_files" >&5
+-echo "${ECHO_T}$enable_pc_files" >&6
+-       else
+-               echo "$as_me:2859: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-               { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
+-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
+-               enable_pc_files=no
+-       fi
+-fi
+ 
+-echo "$as_me:2867: checking if you want to build test-programs" >&5
 +       case x$PKG_CONFIG_LIBDIR in #(vi
 +       x/*) #(vi
@@ -2294 +2696 @@
 +       esac
 +
-+       echo "$as_me:2982: result: $PKG_CONFIG_LIBDIR" >&5
++       echo "$as_me:2787: result: $PKG_CONFIG_LIBDIR" >&5
 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 +fi
 +
 +if test "$PKG_CONFIG" != none ; then
-        if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               echo "$as_me:2988: checking if we should install .pc files for $PKG_CONFIG" >&5
++       echo "$as_me:2792: 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
- 
- # Check whether --enable-pc-files or --disable-pc-files was given.
- if test "${enable_pc_files+set}" = set; then
-@@ -2853,18 +2995,18 @@
- else
-   enable_pc_files=no
- fi;
--               echo "$as_me:2856: result: $enable_pc_files" >&5
-+               echo "$as_me:2998: result: $enable_pc_files" >&5
- echo "${ECHO_T}$enable_pc_files" >&6
--       else
--               echo "$as_me:2859: result: no" >&5
--echo "${ECHO_T}no" >&6
--               { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
--echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-                enable_pc_files=no
-+               { echo "$as_me:3002: WARNING: did not find $PKG_CONFIG library" >&5
-+echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;}
-        fi
++
++# Check whether --enable-pc-files or --disable-pc-files was given.
++if test "${enable_pc_files+set}" = set; then
++  enableval="$enable_pc_files"
++  enable_pc_files=$enableval
++else
++  enable_pc_files=no
++fi;
++       echo "$as_me:2802: result: $enable_pc_files" >&5
++echo "${ECHO_T}$enable_pc_files" >&6
++       if test "$enable_pc_files" != no
++       then
++
++if test "x$prefix" != xNONE; then
++  cf_path_syntax="$prefix"
++else
++  cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$PKG_CONFIG_LIBDIR" in #(vi
++.\$\(*\)*|.\'*\'*) #(vi
++  ;;
++..|./*|.\\*) #(vi
++  ;;
++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
++  ;;
++.\${*prefix}*|.\${*dir}*) #(vi
++  eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
++  case ".$PKG_CONFIG_LIBDIR" in #(vi
++  .NONE/*)
++    PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++    ;;
++  esac
++  ;; #(vi
++.no|.NONE/*)
++  PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++  ;;
++*)
++  { { echo "$as_me:2832: 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; }; }
++  ;;
++esac
++
++       fi
 +else
 +       enable_pc_files=no
- fi
- 
--echo "$as_me:2867: checking if you want to build test-programs" >&5
-+echo "$as_me:3009: checking if you want to build test-programs" >&5
++fi
++
++echo "$as_me:2843: 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.
-@@ -2874,10 +3016,10 @@
+@@ -2874,10 +2850,10 @@
  else
    cf_with_tests=yes
  fi;
 -echo "$as_me:2877: result: $cf_with_tests" >&5
-+echo "$as_me:3019: result: $cf_with_tests" >&5
++echo "$as_me:2853: result: $cf_with_tests" >&5
  echo "${ECHO_T}$cf_with_tests" >&6
  
 -echo "$as_me:2880: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3022: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:2856: 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.
-@@ -2887,11 +3029,11 @@
+@@ -2887,11 +2863,11 @@
  else
    enable_mixedcase=auto
  fi;
 -echo "$as_me:2890: result: $enable_mixedcase" >&5
-+echo "$as_me:3032: result: $enable_mixedcase" >&5
++echo "$as_me:2866: result: $enable_mixedcase" >&5
  echo "${ECHO_T}$enable_mixedcase" >&6
  if test "$enable_mixedcase" = "auto" ; then
  
 -echo "$as_me:2894: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3036: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:2870: 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
-@@ -2918,7 +3060,7 @@
+@@ -2918,7 +2894,7 @@
  fi
  
  fi
 -echo "$as_me:2921: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3063: result: $cf_cv_mixedcase" >&5
++echo "$as_me:2897: result: $cf_cv_mixedcase" >&5
  echo "${ECHO_T}$cf_cv_mixedcase" >&6
  test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
  #define MIXEDCASE_FILENAMES 1
-@@ -2935,7 +3077,7 @@
+@@ -2935,7 +2911,7 @@
  fi
  
  # do this after mixed-case option (tags/TAGS is not as important as tic).
 -echo "$as_me:2938: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3080: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:2914: 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
-@@ -2955,11 +3097,11 @@
+@@ -2955,11 +2931,11 @@
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:2958: result: yes" >&5
-+  echo "$as_me:3100: result: yes" >&5
++  echo "$as_me:2934: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    SET_MAKE=
  else
 -  echo "$as_me:2962: result: no" >&5
-+  echo "$as_me:3104: result: no" >&5
++  echo "$as_me:2938: result: no" >&5
  echo "${ECHO_T}no" >&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2968,7 +3110,7 @@
+@@ -2968,7 +2944,7 @@
  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:2971: checking for $ac_word" >&5
-+echo "$as_me:3113: checking for $ac_word" >&5
++echo "$as_me:2947: 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
-@@ -2983,7 +3125,7 @@
+@@ -2983,7 +2959,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CTAGS="$ac_prog"
 -echo "$as_me:2986: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3128: found $ac_dir/$ac_word" >&5
++echo "$as_me:2962: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2991,10 +3133,10 @@
+@@ -2991,10 +2967,10 @@
  fi
  CTAGS=$ac_cv_prog_CTAGS
  if test -n "$CTAGS"; then
 -  echo "$as_me:2994: result: $CTAGS" >&5
-+  echo "$as_me:3136: result: $CTAGS" >&5
++  echo "$as_me:2970: result: $CTAGS" >&5
  echo "${ECHO_T}$CTAGS" >&6
  else
 -  echo "$as_me:2997: result: no" >&5
-+  echo "$as_me:3139: result: no" >&5
++  echo "$as_me:2973: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3005,7 +3147,7 @@
+@@ -3005,7 +2981,7 @@
  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:3008: checking for $ac_word" >&5
-+echo "$as_me:3150: checking for $ac_word" >&5
++echo "$as_me:2984: 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
-@@ -3020,7 +3162,7 @@
+@@ -3020,7 +2996,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ETAGS="$ac_prog"
 -echo "$as_me:3023: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3165: found $ac_dir/$ac_word" >&5
++echo "$as_me:2999: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3028,10 +3170,10 @@
+@@ -3028,10 +3004,10 @@
  fi
  ETAGS=$ac_cv_prog_ETAGS
  if test -n "$ETAGS"; then
 -  echo "$as_me:3031: result: $ETAGS" >&5
-+  echo "$as_me:3173: result: $ETAGS" >&5
++  echo "$as_me:3007: result: $ETAGS" >&5
  echo "${ECHO_T}$ETAGS" >&6
  else
 -  echo "$as_me:3034: result: no" >&5
-+  echo "$as_me:3176: result: no" >&5
++  echo "$as_me:3010: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3040,7 +3182,7 @@
+@@ -3040,7 +3016,7 @@
  
  # 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:3043: checking for $ac_word" >&5
-+echo "$as_me:3185: checking for $ac_word" >&5
++echo "$as_me:3019: 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
-@@ -3055,7 +3197,7 @@
+@@ -3055,7 +3031,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_LOWER_TAGS="yes"
 -echo "$as_me:3058: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3200: found $ac_dir/$ac_word" >&5
++echo "$as_me:3034: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3064,17 +3206,17 @@
+@@ -3064,17 +3040,17 @@
  fi
  MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
  if test -n "$MAKE_LOWER_TAGS"; then
 -  echo "$as_me:3067: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3209: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3043: result: $MAKE_LOWER_TAGS" >&5
  echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
  else
 -  echo "$as_me:3070: result: no" >&5
-+  echo "$as_me:3212: result: no" >&5
++  echo "$as_me:3046: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -2487 +2912 @@
  set dummy ${ETAGS:-etags}; ac_word=$2
 -echo "$as_me:3077: checking for $ac_word" >&5
-+echo "$as_me:3219: checking for $ac_word" >&5
++echo "$as_me:3053: 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
-@@ -3089,7 +3231,7 @@
+@@ -3089,7 +3065,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_UPPER_TAGS="yes"
 -echo "$as_me:3092: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3234: found $ac_dir/$ac_word" >&5
++echo "$as_me:3068: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3098,10 +3240,10 @@
+@@ -3098,10 +3074,10 @@
  fi
  MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
  if test -n "$MAKE_UPPER_TAGS"; then
 -  echo "$as_me:3101: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3243: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3077: result: $MAKE_UPPER_TAGS" >&5
  echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
  else
 -  echo "$as_me:3104: result: no" >&5
-+  echo "$as_me:3246: result: no" >&5
++  echo "$as_me:3080: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3121,7 +3263,7 @@
+@@ -3121,7 +3097,7 @@
         MAKE_LOWER_TAGS="#"
  fi
  
 -echo "$as_me:3124: checking for makeflags variable" >&5
-+echo "$as_me:3266: checking for makeflags variable" >&5
++echo "$as_me:3100: 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
-@@ -3155,13 +3297,13 @@
+@@ -3155,13 +3131,13 @@
         rm -f cf_makeflags.tmp
  
  fi
 -echo "$as_me:3158: result: $cf_cv_makeflags" >&5
-+echo "$as_me:3300: result: $cf_cv_makeflags" >&5
++echo "$as_me:3134: result: $cf_cv_makeflags" >&5
  echo "${ECHO_T}$cf_cv_makeflags" >&6
  
@@ -2534 +2959 @@
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 -echo "$as_me:3164: checking for $ac_word" >&5
-+echo "$as_me:3306: checking for $ac_word" >&5
++echo "$as_me:3140: 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
-@@ -3176,7 +3318,7 @@
+@@ -3176,7 +3152,7 @@
    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:3179: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3321: found $ac_dir/$ac_word" >&5
++echo "$as_me:3155: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3184,10 +3326,10 @@
+@@ -3184,10 +3160,10 @@
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
 -  echo "$as_me:3187: result: $RANLIB" >&5
-+  echo "$as_me:3329: result: $RANLIB" >&5
++  echo "$as_me:3163: result: $RANLIB" >&5
  echo "${ECHO_T}$RANLIB" >&6
  else
 -  echo "$as_me:3190: result: no" >&5
-+  echo "$as_me:3332: result: no" >&5
++  echo "$as_me:3166: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3196,7 +3338,7 @@
+@@ -3196,7 +3172,7 @@
    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:3199: checking for $ac_word" >&5
-+echo "$as_me:3341: checking for $ac_word" >&5
++echo "$as_me:3175: 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
-@@ -3211,7 +3353,7 @@
+@@ -3211,7 +3187,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_RANLIB="ranlib"
 -echo "$as_me:3214: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3356: found $ac_dir/$ac_word" >&5
++echo "$as_me:3190: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3220,10 +3362,10 @@
+@@ -3220,10 +3196,10 @@
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:3223: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:3365: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3199: result: $ac_ct_RANLIB" >&5
  echo "${ECHO_T}$ac_ct_RANLIB" >&6
  else
 -  echo "$as_me:3226: result: no" >&5
-+  echo "$as_me:3368: result: no" >&5
++  echo "$as_me:3202: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3235,7 +3377,7 @@
+@@ -3235,7 +3211,7 @@
  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:3238: checking for $ac_word" >&5
-+echo "$as_me:3380: checking for $ac_word" >&5
++echo "$as_me:3214: 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
-@@ -3250,7 +3392,7 @@
+@@ -3250,7 +3226,7 @@
    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:3253: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3395: found $ac_dir/$ac_word" >&5
++echo "$as_me:3229: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3258,10 +3400,10 @@
+@@ -3258,10 +3234,10 @@
  fi
  LD=$ac_cv_prog_LD
  if test -n "$LD"; then
 -  echo "$as_me:3261: result: $LD" >&5
-+  echo "$as_me:3403: result: $LD" >&5
++  echo "$as_me:3237: result: $LD" >&5
  echo "${ECHO_T}$LD" >&6
  else
 -  echo "$as_me:3264: result: no" >&5
-+  echo "$as_me:3406: result: no" >&5
++  echo "$as_me:3240: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3270,7 +3412,7 @@
+@@ -3270,7 +3246,7 @@
    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:3273: checking for $ac_word" >&5
-+echo "$as_me:3415: checking for $ac_word" >&5
++echo "$as_me:3249: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3285,7 +3427,7 @@
+@@ -3285,7 +3261,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_LD="ld"
 -echo "$as_me:3288: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3430: found $ac_dir/$ac_word" >&5
++echo "$as_me:3264: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3294,10 +3436,10 @@
+@@ -3294,10 +3270,10 @@
  fi
  ac_ct_LD=$ac_cv_prog_ac_ct_LD
  if test -n "$ac_ct_LD"; then
 -  echo "$as_me:3297: result: $ac_ct_LD" >&5
-+  echo "$as_me:3439: result: $ac_ct_LD" >&5
++  echo "$as_me:3273: result: $ac_ct_LD" >&5
  echo "${ECHO_T}$ac_ct_LD" >&6
  else
 -  echo "$as_me:3300: result: no" >&5
-+  echo "$as_me:3442: result: no" >&5
++  echo "$as_me:3276: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3309,7 +3451,7 @@
+@@ -3309,7 +3285,7 @@
  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:3312: checking for $ac_word" >&5
-+echo "$as_me:3454: checking for $ac_word" >&5
++echo "$as_me:3288: 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
-@@ -3324,7 +3466,7 @@
+@@ -3324,7 +3300,7 @@
    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:3327: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3469: found $ac_dir/$ac_word" >&5
++echo "$as_me:3303: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3332,10 +3474,10 @@
+@@ -3332,10 +3308,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:3335: result: $AR" >&5
-+  echo "$as_me:3477: result: $AR" >&5
++  echo "$as_me:3311: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:3338: result: no" >&5
-+  echo "$as_me:3480: result: no" >&5
++  echo "$as_me:3314: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3344,7 +3486,7 @@
+@@ -3344,7 +3320,7 @@
    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:3347: checking for $ac_word" >&5
-+echo "$as_me:3489: checking for $ac_word" >&5
++echo "$as_me:3323: 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
-@@ -3359,7 +3501,7 @@
+@@ -3359,7 +3335,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:3362: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3504: found $ac_dir/$ac_word" >&5
++echo "$as_me:3338: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3368,10 +3510,10 @@
+@@ -3368,10 +3344,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:3371: result: $ac_ct_AR" >&5
-+  echo "$as_me:3513: result: $ac_ct_AR" >&5
++  echo "$as_me:3347: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:3374: result: no" >&5
-+  echo "$as_me:3516: result: no" >&5
++  echo "$as_me:3350: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3383,7 +3525,7 @@
+@@ -3383,7 +3359,7 @@
  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:3386: checking for $ac_word" >&5
-+echo "$as_me:3528: checking for $ac_word" >&5
++echo "$as_me:3362: 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
-@@ -3398,7 +3540,7 @@
+@@ -3398,7 +3374,7 @@
    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:3401: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3543: found $ac_dir/$ac_word" >&5
++echo "$as_me:3377: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3406,10 +3548,10 @@
+@@ -3406,10 +3382,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:3409: result: $AR" >&5
-+  echo "$as_me:3551: result: $AR" >&5
++  echo "$as_me:3385: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:3412: result: no" >&5
-+  echo "$as_me:3554: result: no" >&5
++  echo "$as_me:3388: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3418,7 +3560,7 @@
+@@ -3418,7 +3394,7 @@
    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:3421: checking for $ac_word" >&5
-+echo "$as_me:3563: checking for $ac_word" >&5
++echo "$as_me:3397: 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
-@@ -3433,7 +3575,7 @@
+@@ -3433,7 +3409,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:3436: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3578: found $ac_dir/$ac_word" >&5
++echo "$as_me:3412: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3442,10 +3584,10 @@
+@@ -3442,10 +3418,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:3445: result: $ac_ct_AR" >&5
-+  echo "$as_me:3587: result: $ac_ct_AR" >&5
++  echo "$as_me:3421: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:3448: result: no" >&5
-+  echo "$as_me:3590: result: no" >&5
++  echo "$as_me:3424: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3454,7 +3596,7 @@
+@@ -3454,7 +3430,7 @@
    AR="$ac_cv_prog_AR"
  fi
  
 -echo "$as_me:3457: checking for options to update archives" >&5
-+echo "$as_me:3599: checking for options to update archives" >&5
++echo "$as_me:3433: 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
-@@ -3477,13 +3619,13 @@
+@@ -3477,13 +3453,13 @@
                 rm -f conftest.a
  
                 cat >conftest.$ac_ext <<EOF
 -#line 3480 "configure"
-+#line 3622 "configure"
++#line 3456 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -               if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:3625: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3486: \$? = $ac_status" >&5
-+  echo "$as_me:3628: \$? = $ac_status" >&5
++  echo "$as_me:3462: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                         $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -3494,7 +3636,7 @@
+@@ -3494,7 +3470,7 @@
                 else
                         test -n "$verbose" && echo "    cannot compile test-program" 1>&6
  
 -echo "${as_me:-configure}:3497: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:3639: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:3473: testing cannot compile test-program ..." 1>&5
  
                         break
                 fi
-@@ -3502,7 +3644,7 @@
+@@ -3502,7 +3478,7 @@
         rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
  
  fi
 -echo "$as_me:3505: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:3647: result: $cf_cv_ar_flags" >&5
++echo "$as_me:3481: result: $cf_cv_ar_flags" >&5
  echo "${ECHO_T}$cf_cv_ar_flags" >&6
  
  if test -n "$ARFLAGS" ; then
-@@ -3513,7 +3655,7 @@
+@@ -3513,7 +3489,7 @@
         ARFLAGS=$cf_cv_ar_flags
  fi
  
 -echo "$as_me:3516: checking if you have specified an install-prefix" >&5
-+echo "$as_me:3658: checking if you have specified an install-prefix" >&5
++echo "$as_me:3492: 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.
-@@ -3526,7 +3668,7 @@
+@@ -3526,7 +3502,7 @@
                 ;;
         esac
  fi;
 -echo "$as_me:3529: result: $DESTDIR" >&5
-+echo "$as_me:3671: result: $DESTDIR" >&5
++echo "$as_me:3505: result: $DESTDIR" >&5
  echo "${ECHO_T}$DESTDIR" >&6
  
  ###############################################################################
-@@ -3554,7 +3696,7 @@
+@@ -3554,7 +3530,7 @@
  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:3557: checking for $ac_word" >&5
-+echo "$as_me:3699: checking for $ac_word" >&5
++echo "$as_me:3533: 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
-@@ -3569,7 +3711,7 @@
+@@ -3569,7 +3545,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_BUILD_CC="$ac_prog"
 -echo "$as_me:3572: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3714: found $ac_dir/$ac_word" >&5
++echo "$as_me:3548: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3577,10 +3719,10 @@
+@@ -3577,10 +3553,10 @@
  fi
  BUILD_CC=$ac_cv_prog_BUILD_CC
  if test -n "$BUILD_CC"; then
 -  echo "$as_me:3580: result: $BUILD_CC" >&5
-+  echo "$as_me:3722: result: $BUILD_CC" >&5
++  echo "$as_me:3556: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  else
 -  echo "$as_me:3583: result: no" >&5
-+  echo "$as_me:3725: result: no" >&5
++  echo "$as_me:3559: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3588,12 +3730,12 @@
+@@ -3588,12 +3564,12 @@
  done
  
  fi;
 -       echo "$as_me:3591: checking for native build C compiler" >&5
-+       echo "$as_me:3733: checking for native build C compiler" >&5
++       echo "$as_me:3567: checking for native build C compiler" >&5
  echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
 -       echo "$as_me:3593: result: $BUILD_CC" >&5
-+       echo "$as_me:3735: result: $BUILD_CC" >&5
++       echo "$as_me:3569: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  
 -       echo "$as_me:3596: checking for native build C preprocessor" >&5
-+       echo "$as_me:3738: checking for native build C preprocessor" >&5
++       echo "$as_me:3572: 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.
-@@ -3603,10 +3745,10 @@
+@@ -3603,10 +3579,10 @@
  else
    BUILD_CPP='${BUILD_CC} -E'
  fi;
 -       echo "$as_me:3606: result: $BUILD_CPP" >&5
-+       echo "$as_me:3748: result: $BUILD_CPP" >&5
++       echo "$as_me:3582: result: $BUILD_CPP" >&5
  echo "${ECHO_T}$BUILD_CPP" >&6
  
 -       echo "$as_me:3609: checking for native build C flags" >&5
-+       echo "$as_me:3751: checking for native build C flags" >&5
++       echo "$as_me:3585: 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.
-@@ -3614,10 +3756,10 @@
+@@ -3614,10 +3590,10 @@
    withval="$with_build_cflags"
    BUILD_CFLAGS="$withval"
  fi;
 -       echo "$as_me:3617: result: $BUILD_CFLAGS" >&5
-+       echo "$as_me:3759: result: $BUILD_CFLAGS" >&5
++       echo "$as_me:3593: result: $BUILD_CFLAGS" >&5
  echo "${ECHO_T}$BUILD_CFLAGS" >&6
  
 -       echo "$as_me:3620: checking for native build C preprocessor-flags" >&5
-+       echo "$as_me:3762: checking for native build C preprocessor-flags" >&5
++       echo "$as_me:3596: 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.
-@@ -3625,10 +3767,10 @@
+@@ -3625,10 +3601,10 @@
    withval="$with_build_cppflags"
    BUILD_CPPFLAGS="$withval"
  fi;
 -       echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5
-+       echo "$as_me:3770: result: $BUILD_CPPFLAGS" >&5
++       echo "$as_me:3604: result: $BUILD_CPPFLAGS" >&5
  echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
  
 -       echo "$as_me:3631: checking for native build linker-flags" >&5
-+       echo "$as_me:3773: checking for native build linker-flags" >&5
++       echo "$as_me:3607: 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.
-@@ -3636,10 +3778,10 @@
+@@ -3636,10 +3612,10 @@
    withval="$with_build_ldflags"
    BUILD_LDFLAGS="$withval"
  fi;
 -       echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5
-+       echo "$as_me:3781: result: $BUILD_LDFLAGS" >&5
++       echo "$as_me:3615: result: $BUILD_LDFLAGS" >&5
  echo "${ECHO_T}$BUILD_LDFLAGS" >&6
  
 -       echo "$as_me:3642: checking for native build linker-libraries" >&5
-+       echo "$as_me:3784: checking for native build linker-libraries" >&5
++       echo "$as_me:3618: 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.
-@@ -3647,7 +3789,7 @@
+@@ -3647,7 +3623,7 @@
    withval="$with_build_libs"
    BUILD_LIBS="$withval"
  fi;
 -       echo "$as_me:3650: result: $BUILD_LIBS" >&5
-+       echo "$as_me:3792: result: $BUILD_LIBS" >&5
++       echo "$as_me:3626: result: $BUILD_LIBS" >&5
  echo "${ECHO_T}$BUILD_LIBS" >&6
  
         # this assumes we're on Unix.
-@@ -3657,7 +3799,7 @@
+@@ -3657,7 +3633,7 @@
         : ${BUILD_CC:='${CC}'}
  
         if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
 -               { { echo "$as_me:3660: error: Cross-build requires two compilers.
-+               { { echo "$as_me:3802: error: Cross-build requires two compilers.
++               { { echo "$as_me:3636: 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;}
-@@ -3682,7 +3824,7 @@
+@@ -3682,7 +3658,7 @@
  ### shared, for example.
  cf_list_models=""
  
 -echo "$as_me:3685: checking if you want to build shared C-objects" >&5
-+echo "$as_me:3827: checking if you want to build shared C-objects" >&5
++echo "$as_me:3661: 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.
-@@ -3692,27 +3834,27 @@
+@@ -3692,27 +3668,27 @@
  else
    with_shared=no
  fi;
 -echo "$as_me:3695: result: $with_shared" >&5
-+echo "$as_me:3837: result: $with_shared" >&5
++echo "$as_me:3671: result: $with_shared" >&5
  echo "${ECHO_T}$with_shared" >&6
  test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
  
 -echo "$as_me:3699: checking for specified models" >&5
-+echo "$as_me:3841: checking for specified models" >&5
++echo "$as_me:3675: 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 "$as_me:3702: result: $cf_list_models" >&5
-+echo "$as_me:3844: result: $cf_list_models" >&5
++echo "$as_me:3678: result: $cf_list_models" >&5
  echo "${ECHO_T}$cf_list_models" >&6
  
@@ -2985 +3410 @@
  ### up test-applications.
 -echo "$as_me:3707: checking for default model" >&5
-+echo "$as_me:3849: checking for default model" >&5
++echo "$as_me:3683: 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 "$as_me:3710: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:3852: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:3686: result: $DFT_LWR_MODEL" >&5
  echo "${ECHO_T}$DFT_LWR_MODEL" >&6
  
@@ -2995 +3420 @@
  
 -echo "$as_me:3715: checking for specific curses-directory" >&5
-+echo "$as_me:3857: checking for specific curses-directory" >&5
++echo "$as_me:3691: 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.
-@@ -3722,7 +3864,7 @@
+@@ -3722,7 +3698,7 @@
  else
    cf_cv_curses_dir=no
  fi;
 -echo "$as_me:3725: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:3867: result: $cf_cv_curses_dir" >&5
++echo "$as_me:3701: result: $cf_cv_curses_dir" >&5
  echo "${ECHO_T}$cf_cv_curses_dir" >&6
  
  if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
-@@ -3753,7 +3895,7 @@
+@@ -3741,7 +3717,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -3753,7 +3729,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:3756: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:3898: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:3732: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -3786,7 +3928,7 @@
+@@ -3786,7 +3762,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 3789 "configure"
-+#line 3931 "configure"
++#line 3765 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -3798,16 +3940,16 @@
+@@ -3798,16 +3774,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3943: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3777: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3804: \$? = $ac_status" >&5
-+  echo "$as_me:3946: \$? = $ac_status" >&5
++  echo "$as_me:3780: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3783: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3810: \$? = $ac_status" >&5
-+  echo "$as_me:3952: \$? = $ac_status" >&5
++  echo "$as_me:3786: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3824,7 +3966,7 @@
+@@ -3824,7 +3800,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:3827: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:3969: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:3803: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -3858,7 +4000,7 @@
+@@ -3858,7 +3834,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:3861: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:4003: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:3837: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -3869,7 +4011,7 @@
+@@ -3869,7 +3845,7 @@
         fi
  fi
  
 -echo "$as_me:3872: checking if you want wide-character code" >&5
-+echo "$as_me:4014: checking if you want wide-character code" >&5
++echo "$as_me:3848: 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.
-@@ -3879,11 +4021,11 @@
+@@ -3879,11 +3855,11 @@
  else
    with_widec=no
  fi;
 -echo "$as_me:3882: result: $with_widec" >&5
-+echo "$as_me:4024: result: $with_widec" >&5
++echo "$as_me:3858: result: $with_widec" >&5
  echo "${ECHO_T}$with_widec" >&6
  if test "$with_widec" = yes ; then
  
 -echo "$as_me:3886: checking for multibyte character support" >&5
-+echo "$as_me:4028: checking for multibyte character support" >&5
++echo "$as_me:3862: 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
-@@ -3891,7 +4033,7 @@
+@@ -3891,7 +3867,7 @@
  
         cf_save_LIBS="$LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 -#line 3894 "configure"
-+#line 4036 "configure"
++#line 3870 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -3904,16 +4046,16 @@
+@@ -3904,16 +3880,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:3907: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4049: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3883: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:3910: \$? = $ac_status" >&5
-+  echo "$as_me:4052: \$? = $ac_status" >&5
++  echo "$as_me:3886: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:3913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3889: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3916: \$? = $ac_status" >&5
-+  echo "$as_me:4058: \$? = $ac_status" >&5
++  echo "$as_me:3892: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -3925,12 +4067,12 @@
+@@ -3925,12 +3901,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
 -echo "${as_me:-configure}:3928: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:4070: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3904: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
@@ -3129 +3563 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 3933 "configure"
-+#line 4075 "configure"
++#line 3909 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -3943,16 +4085,16 @@
+@@ -3943,16 +3919,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:3946: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3922: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:3949: \$? = $ac_status" >&5
-+  echo "$as_me:4091: \$? = $ac_status" >&5
++  echo "$as_me:3925: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:3952: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3928: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3955: \$? = $ac_status" >&5
-+  echo "$as_me:4097: \$? = $ac_status" >&5
++  echo "$as_me:3931: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -3966,7 +4108,7 @@
+@@ -3966,7 +3942,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 3969 "configure"
-+#line 4111 "configure"
++#line 3945 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -3979,16 +4121,16 @@
+@@ -3979,16 +3955,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:3982: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4124: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3958: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:3985: \$? = $ac_status" >&5
-+  echo "$as_me:4127: \$? = $ac_status" >&5
++  echo "$as_me:3961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:3988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3964: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3991: \$? = $ac_status" >&5
-+  echo "$as_me:4133: \$? = $ac_status" >&5
++  echo "$as_me:3967: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -4005,9 +4147,9 @@
+@@ -4005,9 +3981,9 @@
  
      test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
  
 -echo "${as_me:-configure}:4008: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:4150: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:3984: testing find linkage for utf8 library ..." 1>&5
  
 -echo "${as_me:-configure}:4010: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:4152: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3986: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
      cf_save_CPPFLAGS="$CPPFLAGS"
      cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -4120,11 +4262,11 @@
+@@ -4120,11 +4096,11 @@
        if test -d $cf_cv_header_path_utf8 ; then
          test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:4123: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4265: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4099: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
  
          CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 4127 "configure"
-+#line 4269 "configure"
++#line 4103 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -4137,21 +4279,21 @@
+@@ -4137,21 +4113,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4116: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4143: \$? = $ac_status" >&5
-+  echo "$as_me:4285: \$? = $ac_status" >&5
++  echo "$as_me:4119: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4122: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4149: \$? = $ac_status" >&5
-+  echo "$as_me:4291: \$? = $ac_status" >&5
++  echo "$as_me:4125: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -3233 +3667 @@
  
 -echo "${as_me:-configure}:4154: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4296: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4130: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
              cf_cv_find_linkage_utf8=maybe
              cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -4169,7 +4311,7 @@
+@@ -4169,7 +4145,7 @@
  
      if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
 -echo "${as_me:-configure}:4172: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:4314: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:4148: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
        cf_save_LIBS="$LIBS"
        cf_save_LDFLAGS="$LDFLAGS"
-@@ -4266,13 +4408,13 @@
+@@ -4266,13 +4242,13 @@
            if test -d $cf_cv_library_path_utf8 ; then
              test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:4269: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4411: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4245: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
  
              CPPFLAGS="$cf_test_CPPFLAGS"
@@ -3258 +3692 @@
              cat >conftest.$ac_ext <<_ACEOF
 -#line 4275 "configure"
-+#line 4417 "configure"
++#line 4251 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -4285,21 +4427,21 @@
+@@ -4285,21 +4261,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4288: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4430: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4264: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4291: \$? = $ac_status" >&5
-+  echo "$as_me:4433: \$? = $ac_status" >&5
++  echo "$as_me:4267: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4294: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4270: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4297: \$? = $ac_status" >&5
-+  echo "$as_me:4439: \$? = $ac_status" >&5
++  echo "$as_me:4273: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -3285 +3719 @@
  
 -echo "${as_me:-configure}:4302: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4444: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4278: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
                  cf_cv_find_linkage_utf8=yes
                  cf_cv_library_file_utf8="-lutf8"
-@@ -4341,7 +4483,7 @@
+@@ -4341,7 +4317,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4344: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:4486: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:4320: 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
-@@ -4375,7 +4517,7 @@
+@@ -4375,7 +4351,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4378 "configure"
-+#line 4520 "configure"
++#line 4354 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4387,16 +4529,16 @@
+@@ -4387,16 +4363,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4366: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4393: \$? = $ac_status" >&5
-+  echo "$as_me:4535: \$? = $ac_status" >&5
++  echo "$as_me:4369: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4396: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4372: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4399: \$? = $ac_status" >&5
-+  echo "$as_me:4541: \$? = $ac_status" >&5
++  echo "$as_me:4375: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4413,7 +4555,7 @@
+@@ -4413,7 +4389,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4416: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4558: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4392: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4447,7 +4589,7 @@
+@@ -4447,7 +4423,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:4450: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:4592: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4426: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -4461,48 +4603,87 @@
+@@ -4461,48 +4437,87 @@
  cf_ncuconfig_root=ncursesw
  
@@ -3357 +3791 @@
 +    # 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:4612: checking for $ac_word" >&5
++echo "$as_me:4446: 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
@@ -3372 +3806 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:4627: found $ac_dir/$ac_word" >&5
++echo "$as_me:4461: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -3380 +3814 @@
 +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:4635: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:4469: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:4638: result: no" >&5
++  echo "$as_me:4472: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -3397 +3831 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:4468: checking for $ac_word" >&5
-+echo "$as_me:4651: checking for $ac_word" >&5
++echo "$as_me:4485: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
@@ -3423 +3857 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:4666: found $ac_dir/$ac_word" >&5
++echo "$as_me:4500: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -3438 +3872 @@
 +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 +if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  echo "$as_me:4674: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:4508: result: $ac_ct_NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
 -  echo "$as_me:4499: result: no" >&5
-+  echo "$as_me:4677: result: no" >&5
++  echo "$as_me:4511: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -3457 +3891 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -4511,7 +4692,7 @@
+@@ -4511,7 +4526,7 @@
  
  # even with config script, some packages use no-override for curses.h
  
 -echo "$as_me:4514: checking if we have identified curses headers" >&5
-+echo "$as_me:4695: checking if we have identified curses headers" >&5
++echo "$as_me:4529: 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
-@@ -4519,13 +4700,13 @@
+@@ -4519,13 +4534,13 @@
  
  cf_cv_ncurses_header=none
@@ -3481 +3915 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4528 "configure"
-+#line 4709 "configure"
++#line 4543 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -4537,16 +4718,16 @@
+@@ -4537,16 +4552,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4555: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4543: \$? = $ac_status" >&5
-+  echo "$as_me:4724: \$? = $ac_status" >&5
++  echo "$as_me:4558: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4546: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4561: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4549: \$? = $ac_status" >&5
-+  echo "$as_me:4730: \$? = $ac_status" >&5
++  echo "$as_me:4564: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -4557,11 +4738,11 @@
+@@ -4557,11 +4572,11 @@
  done
  
  fi
 -echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:4741: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:4575: result: $cf_cv_ncurses_header" >&5
  echo "${ECHO_T}$cf_cv_ncurses_header" >&6
  
  if test "$cf_cv_ncurses_header" = none ; then
 -       { { echo "$as_me:4564: error: No curses header-files found" >&5
-+       { { echo "$as_me:4745: error: No curses header-files found" >&5
++       { { echo "$as_me:4579: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -4571,23 +4752,23 @@
+@@ -4571,23 +4586,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:4574: checking for $ac_header" >&5
-+echo "$as_me:4755: checking for $ac_header" >&5
++echo "$as_me:4589: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -3532 +3966 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4580 "configure"
-+#line 4761 "configure"
++#line 4595 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:4584: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4765: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4599: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -3544 +3978 @@
    cat conftest.err >&5
 -  echo "$as_me:4590: \$? = $ac_status" >&5
-+  echo "$as_me:4771: \$? = $ac_status" >&5
++  echo "$as_me:4605: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4606,7 +4787,7 @@
+@@ -4606,7 +4621,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4609: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4790: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:4624: 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
-@@ -4659,7 +4840,7 @@
+@@ -4659,7 +4674,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4662 "configure"
-+#line 4843 "configure"
++#line 4677 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4671,16 +4852,16 @@
+@@ -4671,16 +4686,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4855: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4677: \$? = $ac_status" >&5
-+  echo "$as_me:4858: \$? = $ac_status" >&5
++  echo "$as_me:4692: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4680: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4695: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4683: \$? = $ac_status" >&5
-+  echo "$as_me:4864: \$? = $ac_status" >&5
++  echo "$as_me:4698: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4697,7 +4878,7 @@
+@@ -4697,7 +4712,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4700: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4881: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4715: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4714,7 +4895,7 @@
+@@ -4714,7 +4729,7 @@
  
  }
  
 -echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:4898: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:4732: 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
-@@ -4726,7 +4907,7 @@
+@@ -4726,7 +4741,7 @@
         do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 4729 "configure"
-+#line 4910 "configure"
++#line 4744 "configure"
  #include "confdefs.h"
  
  #define _XOPEN_SOURCE_EXTENDED
-@@ -4758,16 +4939,16 @@
+@@ -4758,16 +4773,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4764: \$? = $ac_status" >&5
-+  echo "$as_me:4945: \$? = $ac_status" >&5
++  echo "$as_me:4779: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4767: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4782: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4770: \$? = $ac_status" >&5
-+  echo "$as_me:4951: \$? = $ac_status" >&5
++  echo "$as_me:4785: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -4782,14 +4963,14 @@
+@@ -4782,14 +4797,14 @@
         done
  
  fi
 -echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4966: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:4800: result: $cf_cv_ncurses_h" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h" >&6
  
@@ -3648 +4082 @@
  
 -echo "$as_me:4792: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:4973: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:4807: 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
-@@ -4929,7 +5110,7 @@
+@@ -4929,7 +4944,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4932 "configure"
-+#line 5113 "configure"
++#line 4947 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4941,16 +5122,16 @@
+@@ -4941,16 +4956,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4959: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4947: \$? = $ac_status" >&5
-+  echo "$as_me:5128: \$? = $ac_status" >&5
++  echo "$as_me:4962: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4965: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4953: \$? = $ac_status" >&5
-+  echo "$as_me:5134: \$? = $ac_status" >&5
++  echo "$as_me:4968: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4967,7 +5148,7 @@
+@@ -4967,7 +4982,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4970: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5151: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4985: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4988,7 +5169,7 @@
+@@ -4988,7 +5003,7 @@
                 do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 4991 "configure"
-+#line 5172 "configure"
++#line 5006 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -5012,16 +5193,16 @@
+@@ -5012,16 +5027,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5018: \$? = $ac_status" >&5
-+  echo "$as_me:5199: \$? = $ac_status" >&5
++  echo "$as_me:5033: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5024: \$? = $ac_status" >&5
-+  echo "$as_me:5205: \$? = $ac_status" >&5
++  echo "$as_me:5039: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -5042,12 +5223,12 @@
+@@ -5042,12 +5057,12 @@
                 CPPFLAGS="$cf_save2_CPPFLAGS"
                 test "$cf_cv_ncurses_h2" != no && break
         done
 -       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5045: error: not found" >&5
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5226: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5060: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
@@ -3732 +4166 @@
  fi
 -echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:5231: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:5065: result: $cf_cv_ncurses_h2" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
  
         cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -5080,7 +5261,7 @@
+@@ -5080,7 +5095,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 5083 "configure"
-+#line 5264 "configure"
++#line 5098 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5092,16 +5273,16 @@
+@@ -5092,16 +5107,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5098: \$? = $ac_status" >&5
-+  echo "$as_me:5279: \$? = $ac_status" >&5
++  echo "$as_me:5113: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5116: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5104: \$? = $ac_status" >&5
-+  echo "$as_me:5285: \$? = $ac_status" >&5
++  echo "$as_me:5119: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -5118,7 +5299,7 @@
+@@ -5118,7 +5133,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:5121: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5302: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5136: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -5161,7 +5342,7 @@
+@@ -5161,7 +5176,7 @@
         ;;
  esac
  
 -echo "$as_me:5164: checking for terminfo header" >&5
-+echo "$as_me:5345: checking for terminfo header" >&5
++echo "$as_me:5179: 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
-@@ -5179,7 +5360,7 @@
+@@ -5179,7 +5194,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5182 "configure"
-+#line 5363 "configure"
++#line 5197 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5194,16 +5375,16 @@
+@@ -5194,16 +5209,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5200: \$? = $ac_status" >&5
-+  echo "$as_me:5381: \$? = $ac_status" >&5
++  echo "$as_me:5215: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5218: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5206: \$? = $ac_status" >&5
-+  echo "$as_me:5387: \$? = $ac_status" >&5
++  echo "$as_me:5221: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -5219,7 +5400,7 @@
+@@ -5219,7 +5234,7 @@
  done
  
  fi
 -echo "$as_me:5222: result: $cf_cv_term_header" >&5
-+echo "$as_me:5403: result: $cf_cv_term_header" >&5
++echo "$as_me:5237: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -5253,7 +5434,7 @@
+@@ -5253,7 +5268,7 @@
  #define NCURSES 1
  EOF
  
 -echo "$as_me:5256: checking for ncurses version" >&5
-+echo "$as_me:5437: checking for ncurses version" >&5
++echo "$as_me:5271: 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
-@@ -5279,10 +5460,10 @@
+@@ -5279,10 +5294,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:5282: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:5463: \"$cf_try\"") >&5
++       { (eval echo "$as_me:5297: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5285: \$? = $ac_status" >&5
-+  echo "$as_me:5466: \$? = $ac_status" >&5
++  echo "$as_me:5300: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -5292,7 +5473,7 @@
+@@ -5292,7 +5307,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5295 "configure"
-+#line 5476 "configure"
++#line 5310 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5317,15 +5498,15 @@
+@@ -5317,15 +5332,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:5320: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5335: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5323: \$? = $ac_status" >&5
-+  echo "$as_me:5504: \$? = $ac_status" >&5
++  echo "$as_me:5338: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5328: \$? = $ac_status" >&5
-+  echo "$as_me:5509: \$? = $ac_status" >&5
++  echo "$as_me:5343: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5339,7 +5520,7 @@
+@@ -5339,7 +5354,7 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:5523: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5357: 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
-@@ -5351,7 +5532,7 @@
+@@ -5351,7 +5366,7 @@
         # to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
 -echo "$as_me:5354: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:5535: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:5369: 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
-@@ -5359,7 +5540,7 @@
+@@ -5359,7 +5374,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5362 "configure"
-+#line 5543 "configure"
++#line 5377 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5378,16 +5559,16 @@
+@@ -5378,16 +5393,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5381: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5396: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5384: \$? = $ac_status" >&5
-+  echo "$as_me:5565: \$? = $ac_status" >&5
++  echo "$as_me:5399: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5387: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5402: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5390: \$? = $ac_status" >&5
-+  echo "$as_me:5571: \$? = $ac_status" >&5
++  echo "$as_me:5405: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -5398,10 +5579,10 @@
+@@ -5398,10 +5413,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5401: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5582: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:5416: result: $ac_cv_lib_gpm_Gpm_Open" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
  if test $ac_cv_lib_gpm_Gpm_Open = yes; then
 -  echo "$as_me:5404: checking for initscr in -lgpm" >&5
-+  echo "$as_me:5585: checking for initscr in -lgpm" >&5
++  echo "$as_me:5419: 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
-@@ -5409,7 +5590,7 @@
+@@ -5409,7 +5424,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5412 "configure"
-+#line 5593 "configure"
++#line 5427 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5428,16 +5609,16 @@
+@@ -5428,16 +5443,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5434: \$? = $ac_status" >&5
-+  echo "$as_me:5615: \$? = $ac_status" >&5
++  echo "$as_me:5449: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5437: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5440: \$? = $ac_status" >&5
-+  echo "$as_me:5621: \$? = $ac_status" >&5
++  echo "$as_me:5455: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -5448,7 +5629,7 @@
+@@ -5448,7 +5463,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5451: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:5632: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:5466: result: $ac_cv_lib_gpm_initscr" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
  if test $ac_cv_lib_gpm_initscr = yes; then
    LIBS="$cf_ncurses_SAVE"
-@@ -5463,7 +5644,7 @@
+@@ -5463,7 +5478,7 @@
         # 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:5466: checking for tgoto in -lmytinfo" >&5
-+               echo "$as_me:5647: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:5481: 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
-@@ -5471,7 +5652,7 @@
+@@ -5471,7 +5486,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5474 "configure"
-+#line 5655 "configure"
++#line 5489 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5490,16 +5671,16 @@
+@@ -5490,16 +5505,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5493: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5508: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5496: \$? = $ac_status" >&5
-+  echo "$as_me:5677: \$? = $ac_status" >&5
++  echo "$as_me:5511: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5514: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5502: \$? = $ac_status" >&5
-+  echo "$as_me:5683: \$? = $ac_status" >&5
++  echo "$as_me:5517: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -5510,7 +5691,7 @@
+@@ -5510,7 +5525,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5513: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:5694: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5528: result: $ac_cv_lib_mytinfo_tgoto" >&5
  echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
  if test $ac_cv_lib_mytinfo_tgoto = yes; then
    cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -5529,13 +5710,13 @@
+@@ -5529,13 +5544,13 @@
  
         eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
         cf_libdir=""
 -       echo "$as_me:5532: checking for initscr" >&5
-+       echo "$as_me:5713: checking for initscr" >&5
++       echo "$as_me:5547: checking for initscr" >&5
  echo $ECHO_N "checking for initscr... $ECHO_C" >&6
  if test "${ac_cv_func_initscr+set}" = set; then
@@ -4034 +4468 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5538 "configure"
-+#line 5719 "configure"
++#line 5553 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -5566,16 +5747,16 @@
+@@ -5558,7 +5573,7 @@
+ #if defined (__stub_initscr) || defined (__stub___initscr)
+ choke me
+ #else
+-f = initscr;
++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -5566,16 +5581,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5584: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5572: \$? = $ac_status" >&5
-+  echo "$as_me:5753: \$? = $ac_status" >&5
++  echo "$as_me:5587: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5575: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5590: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5578: \$? = $ac_status" >&5
-+  echo "$as_me:5759: \$? = $ac_status" >&5
++  echo "$as_me:5593: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -5585,18 +5766,18 @@
+@@ -5585,18 +5600,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:5588: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:5769: result: $ac_cv_func_initscr" >&5
++echo "$as_me:5603: result: $ac_cv_func_initscr" >&5
  echo "${ECHO_T}$ac_cv_func_initscr" >&6
  if test $ac_cv_func_initscr = yes; then
@@ -4072 +4515 @@
                 cf_save_LIBS="$LIBS"
 -               echo "$as_me:5595: checking for initscr in -l$cf_nculib_root" >&5
-+               echo "$as_me:5776: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:5610: checking for initscr in -l$cf_nculib_root" >&5
  echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                 LIBS="-l$cf_nculib_root $LIBS"
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 5599 "configure"
-+#line 5780 "configure"
++#line 5614 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5608,25 +5789,25 @@
+@@ -5608,25 +5623,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5611: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5614: \$? = $ac_status" >&5
-+  echo "$as_me:5795: \$? = $ac_status" >&5
++  echo "$as_me:5629: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5617: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5620: \$? = $ac_status" >&5
-+  echo "$as_me:5801: \$? = $ac_status" >&5
++  echo "$as_me:5635: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:5622: result: yes" >&5
-+  echo "$as_me:5803: result: yes" >&5
++  echo "$as_me:5637: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -4109 +4552 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:5629: result: no" >&5
-+echo "$as_me:5810: result: no" >&5
++echo "$as_me:5644: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -5716,11 +5897,11 @@
+@@ -5716,11 +5731,11 @@
  
                         for cf_libdir in $cf_search
                         do
 -                               echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+                               echo "$as_me:5900: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:5734: checking for -l$cf_nculib_root in $cf_libdir" >&5
  echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 5723 "configure"
-+#line 5904 "configure"
++#line 5738 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5732,25 +5913,25 @@
+@@ -5732,25 +5747,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5735: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5750: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5738: \$? = $ac_status" >&5
-+  echo "$as_me:5919: \$? = $ac_status" >&5
++  echo "$as_me:5753: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5741: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5744: \$? = $ac_status" >&5
-+  echo "$as_me:5925: \$? = $ac_status" >&5
++  echo "$as_me:5759: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:5746: result: yes" >&5
-+  echo "$as_me:5927: result: yes" >&5
++  echo "$as_me:5761: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -4155 +4598 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:5753: result: no" >&5
-+echo "$as_me:5934: result: no" >&5
++echo "$as_me:5768: result: no" >&5
  echo "${ECHO_T}no" >&6
                                          LIBS="$cf_save_LIBS"
  fi
-@@ -5765,7 +5946,7 @@
+@@ -5765,7 +5780,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
 -       { { echo "$as_me:5768: error: Cannot link $cf_nculib_root library" >&5
-+       { { echo "$as_me:5949: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:5783: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5773,7 +5954,7 @@
+@@ -5773,7 +5788,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
 -       echo "$as_me:5776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+       echo "$as_me:5957: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:5791: 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
-@@ -5783,7 +5964,7 @@
+@@ -5783,7 +5798,7 @@
                 fi
         done
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5786 "configure"
-+#line 5967 "configure"
++#line 5801 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5795,23 +5976,23 @@
+@@ -5795,23 +5810,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5798: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5813: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5801: \$? = $ac_status" >&5
-+  echo "$as_me:5982: \$? = $ac_status" >&5
++  echo "$as_me:5816: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5819: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5807: \$? = $ac_status" >&5
-+  echo "$as_me:5988: \$? = $ac_status" >&5
++  echo "$as_me:5822: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:5809: result: yes" >&5
-+  echo "$as_me:5990: result: yes" >&5
++  echo "$as_me:5824: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
@@ -4212 +4655 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:5814: result: no" >&5
-+echo "$as_me:5995: result: no" >&5
++echo "$as_me:5829: result: no" >&5
  echo "${ECHO_T}no" >&6
                  LIBS="$cf_ncurses_SAVE"
  fi
-@@ -5831,48 +6012,87 @@
+@@ -5831,48 +5846,87 @@
  cf_ncuconfig_root=ncurses
  
@@ -4227 +4670 @@
 +    # 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:6021: checking for $ac_word" >&5
++echo "$as_me:5855: 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
@@ -4242 +4685 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:6036: found $ac_dir/$ac_word" >&5
++echo "$as_me:5870: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4250 +4693 @@
 +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:6044: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5878: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:6047: result: no" >&5
++  echo "$as_me:5881: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4267 +4710 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:5838: checking for $ac_word" >&5
-+echo "$as_me:6060: checking for $ac_word" >&5
++echo "$as_me:5894: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
@@ -4293 +4736 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:6075: found $ac_dir/$ac_word" >&5
++echo "$as_me:5909: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -4308 +4751 @@
 +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 +if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  echo "$as_me:6083: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5917: result: $ac_ct_NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
 -  echo "$as_me:5869: result: no" >&5
-+  echo "$as_me:6086: result: no" >&5
++  echo "$as_me:5920: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -4327 +4770 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -5881,7 +6101,7 @@
+@@ -5881,7 +5935,7 @@
  
  # even with config script, some packages use no-override for curses.h
  
 -echo "$as_me:5884: checking if we have identified curses headers" >&5
-+echo "$as_me:6104: checking if we have identified curses headers" >&5
++echo "$as_me:5938: 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
-@@ -5889,13 +6109,13 @@
+@@ -5889,13 +5943,13 @@
  
  cf_cv_ncurses_header=none
@@ -4351 +4794 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5898 "configure"
-+#line 6118 "configure"
++#line 5952 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -5907,16 +6127,16 @@
+@@ -5907,16 +5961,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6130: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5964: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5913: \$? = $ac_status" >&5
-+  echo "$as_me:6133: \$? = $ac_status" >&5
++  echo "$as_me:5967: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5916: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5970: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5919: \$? = $ac_status" >&5
-+  echo "$as_me:6139: \$? = $ac_status" >&5
++  echo "$as_me:5973: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -5927,11 +6147,11 @@
+@@ -5927,11 +5981,11 @@
  done
  
  fi
 -echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6150: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5984: result: $cf_cv_ncurses_header" >&5
  echo "${ECHO_T}$cf_cv_ncurses_header" >&6
  
  if test "$cf_cv_ncurses_header" = none ; then
 -       { { echo "$as_me:5934: error: No curses header-files found" >&5
-+       { { echo "$as_me:6154: error: No curses header-files found" >&5
++       { { echo "$as_me:5988: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5941,23 +6161,23 @@
+@@ -5941,23 +5995,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:5944: checking for $ac_header" >&5
-+echo "$as_me:6164: checking for $ac_header" >&5
++echo "$as_me:5998: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -4402 +4845 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5950 "configure"
-+#line 6170 "configure"
++#line 6004 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:5954: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6174: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6008: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -4414 +4857 @@
    cat conftest.err >&5
 -  echo "$as_me:5960: \$? = $ac_status" >&5
-+  echo "$as_me:6180: \$? = $ac_status" >&5
++  echo "$as_me:6014: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5976,7 +6196,7 @@
+@@ -5976,7 +6030,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:5979: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6199: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6033: 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
-@@ -6029,7 +6249,7 @@
+@@ -6029,7 +6083,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6032 "configure"
-+#line 6252 "configure"
++#line 6086 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6041,16 +6261,16 @@
+@@ -6041,16 +6095,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6098: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6047: \$? = $ac_status" >&5
-+  echo "$as_me:6267: \$? = $ac_status" >&5
++  echo "$as_me:6101: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6104: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6053: \$? = $ac_status" >&5
-+  echo "$as_me:6273: \$? = $ac_status" >&5
++  echo "$as_me:6107: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6067,7 +6287,7 @@
+@@ -6067,7 +6121,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6070: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6290: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6124: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6084,7 +6304,7 @@
+@@ -6084,7 +6138,7 @@
  
  }
  
 -echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6307: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:6141: 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
-@@ -6096,7 +6316,7 @@
+@@ -6096,7 +6150,7 @@
         do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 6099 "configure"
-+#line 6319 "configure"
++#line 6153 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -6120,16 +6340,16 @@
+@@ -6120,16 +6174,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6177: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6126: \$? = $ac_status" >&5
-+  echo "$as_me:6346: \$? = $ac_status" >&5
++  echo "$as_me:6180: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6183: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6132: \$? = $ac_status" >&5
-+  echo "$as_me:6352: \$? = $ac_status" >&5
++  echo "$as_me:6186: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -6144,14 +6364,14 @@
+@@ -6144,14 +6198,14 @@
         done
  
  fi
 -echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6367: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6201: result: $cf_cv_ncurses_h" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h" >&6
  
@@ -4518 +4961 @@
  
 -echo "$as_me:6154: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6374: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6208: 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
-@@ -6291,7 +6511,7 @@
+@@ -6291,7 +6345,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6294 "configure"
-+#line 6514 "configure"
++#line 6348 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6303,16 +6523,16 @@
+@@ -6303,16 +6357,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6360: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6309: \$? = $ac_status" >&5
-+  echo "$as_me:6529: \$? = $ac_status" >&5
++  echo "$as_me:6363: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6312: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6366: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6315: \$? = $ac_status" >&5
-+  echo "$as_me:6535: \$? = $ac_status" >&5
++  echo "$as_me:6369: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6329,7 +6549,7 @@
+@@ -6329,7 +6383,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6552: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6386: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6350,7 +6570,7 @@
+@@ -6350,7 +6404,7 @@
                 do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 6353 "configure"
-+#line 6573 "configure"
++#line 6407 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -6374,16 +6594,16 @@
+@@ -6374,16 +6428,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6597: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6380: \$? = $ac_status" >&5
-+  echo "$as_me:6600: \$? = $ac_status" >&5
++  echo "$as_me:6434: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6383: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6603: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6437: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6386: \$? = $ac_status" >&5
-+  echo "$as_me:6606: \$? = $ac_status" >&5
++  echo "$as_me:6440: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -6404,12 +6624,12 @@
+@@ -6404,12 +6458,12 @@
                 CPPFLAGS="$cf_save2_CPPFLAGS"
                 test "$cf_cv_ncurses_h2" != no && break
         done
 -       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6407: error: not found" >&5
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6627: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6461: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
@@ -4602 +5045 @@
  fi
 -echo "$as_me:6412: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6632: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6466: result: $cf_cv_ncurses_h2" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
  
         cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -6442,7 +6662,7 @@
+@@ -6442,7 +6496,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6445 "configure"
-+#line 6665 "configure"
++#line 6499 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6454,16 +6674,16 @@
+@@ -6454,16 +6508,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6460: \$? = $ac_status" >&5
-+  echo "$as_me:6680: \$? = $ac_status" >&5
++  echo "$as_me:6514: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6466: \$? = $ac_status" >&5
-+  echo "$as_me:6686: \$? = $ac_status" >&5
++  echo "$as_me:6520: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6480,7 +6700,7 @@
+@@ -6480,7 +6534,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6483: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6703: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6537: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6523,7 +6743,7 @@
+@@ -6523,7 +6577,7 @@
         ;;
  esac
  
 -echo "$as_me:6526: checking for terminfo header" >&5
-+echo "$as_me:6746: checking for terminfo header" >&5
++echo "$as_me:6580: 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
-@@ -6541,7 +6761,7 @@
+@@ -6541,7 +6595,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6544 "configure"
-+#line 6764 "configure"
++#line 6598 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6556,16 +6776,16 @@
+@@ -6556,16 +6610,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6562: \$? = $ac_status" >&5
-+  echo "$as_me:6782: \$? = $ac_status" >&5
++  echo "$as_me:6616: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6565: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6568: \$? = $ac_status" >&5
-+  echo "$as_me:6788: \$? = $ac_status" >&5
++  echo "$as_me:6622: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -6581,7 +6801,7 @@
+@@ -6581,7 +6635,7 @@
  done
  
  fi
 -echo "$as_me:6584: result: $cf_cv_term_header" >&5
-+echo "$as_me:6804: result: $cf_cv_term_header" >&5
++echo "$as_me:6638: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -6615,7 +6835,7 @@
+@@ -6615,7 +6669,7 @@
  #define NCURSES 1
  EOF
  
 -echo "$as_me:6618: checking for ncurses version" >&5
-+echo "$as_me:6838: checking for ncurses version" >&5
++echo "$as_me:6672: 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
-@@ -6641,10 +6861,10 @@
+@@ -6641,10 +6695,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:6644: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:6864: \"$cf_try\"") >&5
++       { (eval echo "$as_me:6698: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6647: \$? = $ac_status" >&5
-+  echo "$as_me:6867: \$? = $ac_status" >&5
++  echo "$as_me:6701: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -6654,7 +6874,7 @@
+@@ -6654,7 +6708,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6657 "configure"
-+#line 6877 "configure"
++#line 6711 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6679,15 +6899,15 @@
+@@ -6679,15 +6733,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6902: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6736: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6685: \$? = $ac_status" >&5
-+  echo "$as_me:6905: \$? = $ac_status" >&5
++  echo "$as_me:6739: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6741: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6690: \$? = $ac_status" >&5
-+  echo "$as_me:6910: \$? = $ac_status" >&5
++  echo "$as_me:6744: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6701,7 +6921,7 @@
+@@ -6701,7 +6755,7 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:6704: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:6924: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6758: 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
-@@ -6713,7 +6933,7 @@
+@@ -6713,7 +6767,7 @@
         # to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
 -echo "$as_me:6716: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:6936: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6770: 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
-@@ -6721,7 +6941,7 @@
+@@ -6721,7 +6775,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6724 "configure"
-+#line 6944 "configure"
++#line 6778 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6740,16 +6960,16 @@
+@@ -6740,16 +6794,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6743: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6797: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6746: \$? = $ac_status" >&5
-+  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:6800: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6749: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6803: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6752: \$? = $ac_status" >&5
-+  echo "$as_me:6972: \$? = $ac_status" >&5
++  echo "$as_me:6806: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -6760,10 +6980,10 @@
+@@ -6760,10 +6814,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6763: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:6983: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6817: result: $ac_cv_lib_gpm_Gpm_Open" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
  if test $ac_cv_lib_gpm_Gpm_Open = yes; then
 -  echo "$as_me:6766: checking for initscr in -lgpm" >&5
-+  echo "$as_me:6986: checking for initscr in -lgpm" >&5
++  echo "$as_me:6820: 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
-@@ -6771,7 +6991,7 @@
+@@ -6771,7 +6825,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6774 "configure"
-+#line 6994 "configure"
++#line 6828 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6790,16 +7010,16 @@
+@@ -6790,16 +6844,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6847: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6796: \$? = $ac_status" >&5
-+  echo "$as_me:7016: \$? = $ac_status" >&5
++  echo "$as_me:6850: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6853: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6802: \$? = $ac_status" >&5
-+  echo "$as_me:7022: \$? = $ac_status" >&5
++  echo "$as_me:6856: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -6810,7 +7030,7 @@
+@@ -6810,7 +6864,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6813: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:7033: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6867: result: $ac_cv_lib_gpm_initscr" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
  if test $ac_cv_lib_gpm_initscr = yes; then
    LIBS="$cf_ncurses_SAVE"
-@@ -6825,7 +7045,7 @@
+@@ -6825,7 +6879,7 @@
         # 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:6828: checking for tgoto in -lmytinfo" >&5
-+               echo "$as_me:7048: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:6882: 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
-@@ -6833,7 +7053,7 @@
+@@ -6833,7 +6887,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6836 "configure"
-+#line 7056 "configure"
++#line 6890 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6852,16 +7072,16 @@
+@@ -6852,16 +6906,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6855: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6909: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6858: \$? = $ac_status" >&5
-+  echo "$as_me:7078: \$? = $ac_status" >&5
++  echo "$as_me:6912: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6915: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6864: \$? = $ac_status" >&5
-+  echo "$as_me:7084: \$? = $ac_status" >&5
++  echo "$as_me:6918: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -6872,7 +7092,7 @@
+@@ -6872,7 +6926,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6875: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7095: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6929: result: $ac_cv_lib_mytinfo_tgoto" >&5
  echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
  if test $ac_cv_lib_mytinfo_tgoto = yes; then
    cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -6891,13 +7111,13 @@
+@@ -6891,13 +6945,13 @@
  
         eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
         cf_libdir=""
 -       echo "$as_me:6894: checking for initscr" >&5
-+       echo "$as_me:7114: checking for initscr" >&5
++       echo "$as_me:6948: checking for initscr" >&5
  echo $ECHO_N "checking for initscr... $ECHO_C" >&6
  if test "${ac_cv_func_initscr+set}" = set; then
@@ -4904 +5347 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6900 "configure"
-+#line 7120 "configure"
++#line 6954 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -6928,16 +7148,16 @@
+@@ -6920,7 +6974,7 @@
+ #if defined (__stub_initscr) || defined (__stub___initscr)
+ choke me
+ #else
+-f = initscr;
++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6928,16 +6982,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6931: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7151: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6985: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6934: \$? = $ac_status" >&5
-+  echo "$as_me:7154: \$? = $ac_status" >&5
++  echo "$as_me:6988: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6991: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6940: \$? = $ac_status" >&5
-+  echo "$as_me:7160: \$? = $ac_status" >&5
++  echo "$as_me:6994: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -6947,18 +7167,18 @@
+@@ -6947,18 +7001,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6950: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7170: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7004: result: $ac_cv_func_initscr" >&5
  echo "${ECHO_T}$ac_cv_func_initscr" >&6
  if test $ac_cv_func_initscr = yes; then
@@ -4942 +5394 @@
                 cf_save_LIBS="$LIBS"
 -               echo "$as_me:6957: checking for initscr in -l$cf_nculib_root" >&5
-+               echo "$as_me:7177: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:7011: checking for initscr in -l$cf_nculib_root" >&5
  echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                 LIBS="-l$cf_nculib_root $LIBS"
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 6961 "configure"
-+#line 7181 "configure"
++#line 7015 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -6970,25 +7190,25 @@
+@@ -6970,25 +7024,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6973: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7027: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6976: \$? = $ac_status" >&5
-+  echo "$as_me:7196: \$? = $ac_status" >&5
++  echo "$as_me:7030: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6979: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7033: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6982: \$? = $ac_status" >&5
-+  echo "$as_me:7202: \$? = $ac_status" >&5
++  echo "$as_me:7036: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:6984: result: yes" >&5
-+  echo "$as_me:7204: result: yes" >&5
++  echo "$as_me:7038: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -4979 +5431 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:6991: result: no" >&5
-+echo "$as_me:7211: result: no" >&5
++echo "$as_me:7045: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -7078,11 +7298,11 @@
+@@ -7078,11 +7132,11 @@
  
                         for cf_libdir in $cf_search
                         do
 -                               echo "$as_me:7081: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+                               echo "$as_me:7301: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:7135: checking for -l$cf_nculib_root in $cf_libdir" >&5
  echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7085 "configure"
-+#line 7305 "configure"
++#line 7139 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7094,25 +7314,25 @@
+@@ -7094,25 +7148,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7097: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7151: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7100: \$? = $ac_status" >&5
-+  echo "$as_me:7320: \$? = $ac_status" >&5
++  echo "$as_me:7154: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7106: \$? = $ac_status" >&5
-+  echo "$as_me:7326: \$? = $ac_status" >&5
++  echo "$as_me:7160: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7108: result: yes" >&5
-+  echo "$as_me:7328: result: yes" >&5
++  echo "$as_me:7162: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -5025 +5477 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7115: result: no" >&5
-+echo "$as_me:7335: result: no" >&5
++echo "$as_me:7169: result: no" >&5
  echo "${ECHO_T}no" >&6
                                          LIBS="$cf_save_LIBS"
  fi
-@@ -7127,7 +7347,7 @@
+@@ -7127,7 +7181,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
 -       { { echo "$as_me:7130: error: Cannot link $cf_nculib_root library" >&5
-+       { { echo "$as_me:7350: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:7184: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -7135,7 +7355,7 @@
+@@ -7135,7 +7189,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
 -       echo "$as_me:7138: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+       echo "$as_me:7358: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:7192: 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
-@@ -7145,7 +7365,7 @@
+@@ -7145,7 +7199,7 @@
                 fi
         done
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7148 "configure"
-+#line 7368 "configure"
++#line 7202 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7157,23 +7377,23 @@
+@@ -7157,23 +7211,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7380: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7214: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7163: \$? = $ac_status" >&5
-+  echo "$as_me:7383: \$? = $ac_status" >&5
++  echo "$as_me:7217: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7386: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7220: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7169: \$? = $ac_status" >&5
-+  echo "$as_me:7389: \$? = $ac_status" >&5
++  echo "$as_me:7223: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7171: result: yes" >&5
-+  echo "$as_me:7391: result: yes" >&5
++  echo "$as_me:7225: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
@@ -5082 +5534 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7176: result: no" >&5
-+echo "$as_me:7396: result: no" >&5
++echo "$as_me:7230: result: no" >&5
  echo "${ECHO_T}no" >&6
                  LIBS="$cf_ncurses_SAVE"
  fi
-@@ -7210,10 +7430,10 @@
+@@ -7210,10 +7264,10 @@
  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:7213: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:7433: \"$cf_try\"") >&5
++       { (eval echo "$as_me:7267: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7216: \$? = $ac_status" >&5
-+  echo "$as_me:7436: \$? = $ac_status" >&5
++  echo "$as_me:7270: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[   ][      ]*//"`
-@@ -7231,9 +7451,25 @@
+@@ -7231,9 +7285,25 @@
  
  cf_cv_timestamp=`date`
  
 -echo "$as_me:7234: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:7454: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:7288: 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 "$as_me:7457: checking if you want to have a library-prefix" >&5
++echo "$as_me:7291: 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
 +
@@ -5117 +5569 @@
 +  with_lib_prefix=auto
 +fi;
-+echo "$as_me:7467: result: $with_lib_prefix" >&5
++echo "$as_me:7301: result: $with_lib_prefix" >&5
 +echo "${ECHO_T}$with_lib_prefix" >&6
 +
@@ -5126 +5578 @@
         OS/2*|os2*) #(vi
          LIB_PREFIX=''
-@@ -7243,7 +7479,12 @@
+@@ -7243,7 +7313,12 @@
         esac
  cf_prefix=$LIB_PREFIX
@@ -5140 +5592 @@
  LIB_SUFFIX=
  
-@@ -7254,7 +7495,7 @@
+@@ -7254,7 +7329,7 @@
         test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
  fi
  
 -echo "$as_me:7257: checking for default loader flags" >&5
-+echo "$as_me:7498: checking for default loader flags" >&5
++echo "$as_me:7332: 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=''   ;;
-@@ -7262,11 +7503,11 @@
+@@ -7262,11 +7337,11 @@
  profile) LD_MODEL='-pg';;
  shared)  LD_MODEL=''   ;;
  esac
 -echo "$as_me:7265: result: $LD_MODEL" >&5
-+echo "$as_me:7506: result: $LD_MODEL" >&5
++echo "$as_me:7340: result: $LD_MODEL" >&5
  echo "${ECHO_T}$LD_MODEL" >&6
  
  LD_RPATH_OPT=
 -echo "$as_me:7269: checking for an rpath option" >&5
-+echo "$as_me:7510: checking for an rpath option" >&5
++echo "$as_me:7344: checking for an rpath option" >&5
  echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
  case $cf_cv_system_name in #(vi
  irix*) #(vi
-@@ -7279,10 +7520,10 @@
+@@ -7279,10 +7354,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -5176 +5628 @@
         ;;
  netbsd*) #(vi
-@@ -7297,17 +7538,17 @@
+@@ -7297,17 +7372,17 @@
  *)
         ;;
  esac
 -echo "$as_me:7300: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:7541: result: $LD_RPATH_OPT" >&5
++echo "$as_me:7375: result: $LD_RPATH_OPT" >&5
  echo "${ECHO_T}$LD_RPATH_OPT" >&6
  
@@ -5187 +5639 @@
  x-R*)
 -       echo "$as_me:7305: checking if we need a space after rpath option" >&5
-+       echo "$as_me:7546: checking if we need a space after rpath option" >&5
++       echo "$as_me:7380: 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"
@@ -5193 +5645 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7310 "configure"
-+#line 7551 "configure"
++#line 7385 "configure"
  #include "confdefs.h"
  
  int
-@@ -7319,16 +7560,16 @@
+@@ -7319,16 +7394,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7322: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7397: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7325: \$? = $ac_status" >&5
-+  echo "$as_me:7566: \$? = $ac_status" >&5
++  echo "$as_me:7400: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7403: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7331: \$? = $ac_status" >&5
-+  echo "$as_me:7572: \$? = $ac_status" >&5
++  echo "$as_me:7406: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_space=no
  else
-@@ -7338,7 +7579,7 @@
+@@ -7338,7 +7413,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         LIBS="$cf_save_LIBS"
 -       echo "$as_me:7341: result: $cf_rpath_space" >&5
-+       echo "$as_me:7582: result: $cf_rpath_space" >&5
++       echo "$as_me:7416: result: $cf_rpath_space" >&5
  echo "${ECHO_T}$cf_rpath_space" >&6
         test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
         ;;
-@@ -7353,7 +7594,7 @@
+@@ -7353,7 +7428,7 @@
         cf_ld_rpath_opt=
         test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
  
 -       echo "$as_me:7356: checking if release/abi version should be used for shared libs" >&5
-+       echo "$as_me:7597: checking if release/abi version should be used for shared libs" >&5
++       echo "$as_me:7431: 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.
-@@ -7368,7 +7609,7 @@
+@@ -7368,7 +7443,7 @@
                 cf_cv_shlib_version=$withval
                 ;;
         *)
 -               { { echo "$as_me:7371: error: option value must be one of: rel, abi, auto or no" >&5
-+               { { echo "$as_me:7612: error: option value must be one of: rel, abi, auto or no" >&5
++               { { echo "$as_me:7446: error: option value must be one of: rel, abi, auto or no" >&5
  echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
     { (exit 1); exit 1; }; }
                 ;;
-@@ -7377,7 +7618,7 @@
+@@ -7377,7 +7452,7 @@
  else
    cf_cv_shlib_version=auto
  fi;
 -       echo "$as_me:7380: result: $cf_cv_shlib_version" >&5
-+       echo "$as_me:7621: result: $cf_cv_shlib_version" >&5
++       echo "$as_me:7455: result: $cf_cv_shlib_version" >&5
  echo "${ECHO_T}$cf_cv_shlib_version" >&6
  
         cf_cv_rm_so_locs=no
-@@ -7386,14 +7627,14 @@
+@@ -7386,14 +7461,14 @@
         CC_SHARED_OPTS=
         if test "$GCC" = yes
         then
 -               echo "$as_me:7389: checking which $CC option to use" >&5
-+               echo "$as_me:7630: checking which $CC option to use" >&5
++               echo "$as_me:7464: checking which $CC option to use" >&5
  echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
                 cf_save_CFLAGS="$CFLAGS"
@@ -5267 +5719 @@
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 7396 "configure"
-+#line 7637 "configure"
++#line 7471 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -7405,16 +7646,16 @@
+@@ -7405,16 +7480,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7483: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7411: \$? = $ac_status" >&5
-+  echo "$as_me:7652: \$? = $ac_status" >&5
++  echo "$as_me:7486: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7414: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7489: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7417: \$? = $ac_status" >&5
-+  echo "$as_me:7658: \$? = $ac_status" >&5
++  echo "$as_me:7492: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -7423,7 +7664,7 @@
+@@ -7423,7 +7498,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 done
 -               echo "$as_me:7426: result: $CC_SHARED_OPTS" >&5
-+               echo "$as_me:7667: result: $CC_SHARED_OPTS" >&5
++               echo "$as_me:7501: result: $CC_SHARED_OPTS" >&5
  echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                 CFLAGS="$cf_save_CFLAGS"
         fi
-@@ -7431,10 +7672,14 @@
+@@ -7431,10 +7506,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -5318 +5770 @@
                 ;;
         beos*) #(vi
-@@ -7465,7 +7710,7 @@
+@@ -7465,7 +7544,7 @@
                 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                 cf_cv_shlib_version_infix=yes
 -               echo "$as_me:7468: checking if ld -search_paths_first works" >&5
-+               echo "$as_me:7713: checking if ld -search_paths_first works" >&5
++               echo "$as_me:7547: 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
-@@ -7474,7 +7719,7 @@
+@@ -7474,7 +7553,7 @@
                         cf_save_LDFLAGS=$LDFLAGS
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 7477 "configure"
-+#line 7722 "configure"
++#line 7556 "configure"
  #include "confdefs.h"
  
  int
-@@ -7486,16 +7731,16 @@
+@@ -7486,16 +7565,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7489: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7568: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7492: \$? = $ac_status" >&5
-+  echo "$as_me:7737: \$? = $ac_status" >&5
++  echo "$as_me:7571: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7495: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7574: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7498: \$? = $ac_status" >&5
-+  echo "$as_me:7743: \$? = $ac_status" >&5
++  echo "$as_me:7577: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ldflags_search_paths_first=yes
  else
-@@ -7506,7 +7751,7 @@
+@@ -7506,7 +7585,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                 LDFLAGS=$cf_save_LDFLAGS
  fi
 -echo "$as_me:7509: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:7754: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7588: result: $cf_cv_ldflags_search_paths_first" >&5
  echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                 if test $cf_cv_ldflags_search_paths_first = yes; then
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -7525,9 +7770,19 @@
+@@ -7525,9 +7604,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -5387 +5839 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -7544,7 +7799,7 @@
+@@ -7544,7 +7633,7 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -5396 +5848 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -7556,13 +7811,13 @@
+@@ -7556,13 +7645,34 @@
  
                 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                 ;;
 -       openbsd[2-9].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\$1
++               IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \$SHARED_LIB
++               ** IMPORT_LIB \$IMPORT_LIB
++EOF
++               exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[2-9].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -5412 +5885 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
  
-@@ -7580,12 +7835,12 @@
+@@ -7580,12 +7690,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -5428 +5901 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -7602,7 +7857,7 @@
+@@ -7602,7 +7712,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -5437 +5910 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -7686,7 +7941,7 @@
+@@ -7686,7 +7796,7 @@
                         do
                                 CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7689 "configure"
-+#line 7944 "configure"
++#line 7799 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -7698,16 +7953,16 @@
+@@ -7698,16 +7808,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7701: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7811: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7704: \$? = $ac_status" >&5
-+  echo "$as_me:7959: \$? = $ac_status" >&5
++  echo "$as_me:7814: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7710: \$? = $ac_status" >&5
-+  echo "$as_me:7965: \$? = $ac_status" >&5
++  echo "$as_me:7820: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -7744,22 +7999,22 @@
+@@ -7744,22 +7854,30 @@
                         test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                         ;;
                 *)
 -                       { echo "$as_me:7747: WARNING: ignored --with-shlib-version" >&5
-+                       { echo "$as_me:8002: WARNING: ignored --with-shlib-version" >&5
++                       { echo "$as_me:7857: WARNING: ignored --with-shlib-version" >&5
  echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                         ;;
@@ -5485 +5958 @@
 +       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 "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
++
++echo "${as_me:-configure}:7870: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++
++       test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
++
++echo "${as_me:-configure}:7874: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
  
  # The test/sample programs in the original tree link using rpath option.
@@ -5491 +5972 @@
  then
 -       echo "$as_me:7762: checking if you want to link sample programs with rpath option" >&5
-+       echo "$as_me:8017: checking if you want to link sample programs with rpath option" >&5
++       echo "$as_me:7880: 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.
-@@ -7769,7 +8024,7 @@
+@@ -7769,7 +7887,7 @@
  else
    with_rpath_link=yes
  fi;
 -       echo "$as_me:7772: result: $with_rpath_link" >&5
-+       echo "$as_me:8027: result: $with_rpath_link" >&5
++       echo "$as_me:7890: result: $with_rpath_link" >&5
  echo "${ECHO_T}$with_rpath_link" >&6
         if test "$with_rpath_link" = no
         then
-@@ -7780,13 +8035,8 @@
+@@ -7780,13 +7898,8 @@
  
  ###############################################################################
@@ -5515 +5996 @@
  ###   use option --enable-broken-linker to force on use of broken-linker support
 -echo "$as_me:7789: checking if you want broken-linker support code" >&5
-+echo "$as_me:8039: checking if you want broken-linker support code" >&5
++echo "$as_me:7902: 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.
-@@ -7796,7 +8046,7 @@
+@@ -7796,7 +7909,7 @@
  else
    with_broken_linker=${BROKEN_LINKER:-no}
  fi;
 -echo "$as_me:7799: result: $with_broken_linker" >&5
-+echo "$as_me:8049: result: $with_broken_linker" >&5
++echo "$as_me:7912: result: $with_broken_linker" >&5
  echo "${ECHO_T}$with_broken_linker" >&6
  
  BROKEN_LINKER=0
-@@ -7816,7 +8066,7 @@
+@@ -7816,7 +7929,7 @@
                 BROKEN_LINKER=1
                 test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
  
 -echo "${as_me:-configure}:7819: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:8069: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7932: testing cygwin linker is broken anyway ..." 1>&5
  
                 ;;
         esac
-@@ -7829,7 +8079,7 @@
+@@ -7829,7 +7942,7 @@
  cf_xopen_source=
  
@@ -5546 +6027 @@
         ;;
  cygwin) #(vi
-@@ -7840,6 +8090,7 @@
+@@ -7840,6 +7953,7 @@
         ;;
  darwin*) #(vi
@@ -5554 +6035 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -7857,17 +8108,18 @@
+@@ -7857,17 +7971,18 @@
         ;;
  irix[56].*) #(vi
@@ -5563 +6044 @@
  
 -echo "$as_me:7863: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:8115: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7978: 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
@@ -5571 +6052 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7870 "configure"
-+#line 8122 "configure"
++#line 7985 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7882,16 +8134,16 @@
+@@ -7882,16 +7997,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8000: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7888: \$? = $ac_status" >&5
-+  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8003: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7891: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8006: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7894: \$? = $ac_status" >&5
-+  echo "$as_me:8146: \$? = $ac_status" >&5
++  echo "$as_me:8009: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7900,7 +8152,7 @@
+@@ -7900,7 +8015,7 @@
  cf_save="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 7903 "configure"
-+#line 8155 "configure"
++#line 8018 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7915,16 +8167,16 @@
+@@ -7915,16 +8030,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7918: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7921: \$? = $ac_status" >&5
-+  echo "$as_me:8173: \$? = $ac_status" >&5
++  echo "$as_me:8036: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7927: \$? = $ac_status" >&5
-+  echo "$as_me:8179: \$? = $ac_status" >&5
++  echo "$as_me:8042: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7939,47 +8191,293 @@
+@@ -7939,51 +8054,45 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:7942: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:8194: result: $cf_cv_gnu_source" >&5
++echo "$as_me:8057: result: $cf_cv_gnu_source" >&5
  echo "${ECHO_T}$cf_cv_gnu_source" >&6
  test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
@@ -5664 +6145 @@
 -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
 +       # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
 +       cf_XOPEN_SOURCE=
- 
--       cat >conftest.$ac_ext <<_ACEOF
--#line 7979 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--int
++
 +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 +
@@ -5687 +6161 @@
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +
-+echo "$as_me:8216: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8079: 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 "${as_me:-configure}:8222: testing if the symbol is already defined go no further ..." 1>&5
-+
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 8225 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
++echo "${as_me:-configure}:8085: testing if the symbol is already defined go no further ..." 1>&5
++
+        cat >conftest.$ac_ext <<_ACEOF
+-#line 7979 "configure"
++#line 8088 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+ main ()
+ {
+ 
+-#ifndef _XOPEN_SOURCE
 +#ifndef _POSIX_C_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8240: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8243: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8246: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8249: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -7991,32 +8100,44 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7997: \$? = $ac_status" >&5
++  echo "$as_me:8106: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8003: \$? = $ac_status" >&5
++  echo "$as_me:8112: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  cf_cv_xopen_source=no
 +  cf_cv_posix_c_source=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_save="$CPPFLAGS"
+-        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+-        cat >conftest.$ac_ext <<_ACEOF
+-#line 8012 "configure"
 +cf_want_posix_source=no
 +        case .$cf_POSIX_C_SOURCE in #(vi
@@ -5741 +6226 @@
 +        if test "$cf_want_posix_source" = yes ; then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 8270 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+
++#line 8133 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+ main ()
+ {
+ 
+-#ifdef _XOPEN_SOURCE
 +#ifdef _POSIX_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8285: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8288: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8291: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8294: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -8024,33 +8145,278 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8030: \$? = $ac_status" >&5
++  echo "$as_me:8151: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8033: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8036: \$? = $ac_status" >&5
++  echo "$as_me:8157: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  cf_cv_xopen_source=no
 +  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_xopen_source=$cf_XOPEN_SOURCE
 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-       CPPFLAGS="$cf_save"
 +        fi
 +
-+echo "${as_me:-configure}:8305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8168: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 +
 +        CFLAGS="$cf_trim_CFLAGS"
 +        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 +
-+echo "${as_me:-configure}:8310: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8173: testing if the second compile does not leave our definition intact error ..." 1>&5
 +
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 8313 "configure"
++#line 8176 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -5799 +6292 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8331: \$? = $ac_status" >&5
++  echo "$as_me:8194: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8197: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8337: \$? = $ac_status" >&5
++  echo "$as_me:8200: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -5824 +6317 @@
 +
 +fi
-+echo "$as_me:8353: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8216: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 +
@@ -5937 +6430 @@
 +*)
 +
-+echo "$as_me:8466: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8329: 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
@@ -5944 +6437 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8473 "configure"
++#line 8336 "configure"
 +#include "confdefs.h"
 +
@@ -5951 +6444 @@
 +#include <sys/types.h>
 +
-+int
- main ()
- {
- 
-@@ -7991,16 +8489,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7997: \$? = $ac_status" >&5
-+  echo "$as_me:8495: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8003: \$? = $ac_status" >&5
-+  echo "$as_me:8501: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8009,9 +8507,13 @@
- cf_save="$CPPFLAGS"
-         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-         cat >conftest.$ac_ext <<_ACEOF
--#line 8012 "configure"
-+#line 8510 "configure"
- #include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
-+
- int
- main ()
- {
-@@ -8024,16 +8526,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8030: \$? = $ac_status" >&5
-+  echo "$as_me:8532: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8033: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8036: \$? = $ac_status" >&5
-+  echo "$as_me:8538: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8048,9 +8550,10 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8051: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8553: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
--       if test "$cf_cv_xopen_source" != no ; then
-+
-+if test "$cf_cv_xopen_source" != no ; then
- 
- CFLAGS=`echo "$CFLAGS" | \
-        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-@@ -8060,7 +8563,7 @@
-        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-                -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
- 
--               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -8140,7 +8643,7 @@
-        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
--       fi
-+fi
- 
- cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
- 
-@@ -8155,16 +8658,16 @@
-        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
-                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
- 
--echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8661: 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 "${as_me:-configure}:8164: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8667: testing if the symbol is already defined go no further ..." 1>&5
- 
-        cat >conftest.$ac_ext <<_ACEOF
--#line 8167 "configure"
-+#line 8670 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8179,16 +8682,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8685: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8185: \$? = $ac_status" >&5
-+  echo "$as_me:8688: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8188: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8691: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8191: \$? = $ac_status" >&5
-+  echo "$as_me:8694: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8209,7 +8712,7 @@
-         esac
-         if test "$cf_want_posix_source" = yes ; then
-                cat >conftest.$ac_ext <<_ACEOF
--#line 8212 "configure"
-+#line 8715 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8224,16 +8727,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8230: \$? = $ac_status" >&5
-+  echo "$as_me:8733: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8236: \$? = $ac_status" >&5
-+  echo "$as_me:8739: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8244,15 +8747,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-         fi
- 
--echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8750: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
-         CFLAGS="$cf_trim_CFLAGS"
-         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8755: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
-         cat >conftest.$ac_ext <<_ACEOF
--#line 8255 "configure"
-+#line 8758 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8267,16 +8770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8273: \$? = $ac_status" >&5
-+  echo "$as_me:8776: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8276: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8279: \$? = $ac_status" >&5
-+  echo "$as_me:8782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8292,7 +8795,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8798: 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
-@@ -8464,6 +8967,273 @@
- 
- fi
- 
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+       echo "$as_me:8971: checking if _XOPEN_SOURCE really is set" >&5
-+echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 8974 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
 +int
 +main ()
@@ -6186 +6456 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8992: \$? = $ac_status" >&5
++  echo "$as_me:8358: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8998: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_XOPEN_SOURCE_set=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_XOPEN_SOURCE_set=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+       echo "$as_me:9007: result: $cf_XOPEN_SOURCE_set" >&5
-+echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
-+       if test $cf_XOPEN_SOURCE_set = yes
-+       then
-+               cat >conftest.$ac_ext <<_ACEOF
-+#line 9012 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9027: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9030: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9033: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9036: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_XOPEN_SOURCE_set_ok=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_XOPEN_SOURCE_set_ok=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+               if test $cf_XOPEN_SOURCE_set_ok = no
-+               then
-+                       { echo "$as_me:9047: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
-+               fi
-+       else
-+
-+echo "$as_me:9052: checking if we should define _XOPEN_SOURCE" >&5
-+echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
-+if test "${cf_cv_xopen_source+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 9059 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9078: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9081: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9084: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9087: \$? = $ac_status" >&5
++  echo "$as_me:8364: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -6293 +6474 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 9096 "configure"
++#line 8373 "configure"
 +#include "confdefs.h"
 +
@@ -6312 +6493 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9118: \$? = $ac_status" >&5
++  echo "$as_me:8395: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9124: \$? = $ac_status" >&5
++  echo "$as_me:8401: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -6331 +6512 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +       CPPFLAGS="$cf_save"
-+
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8051: result: $cf_cv_xopen_source" >&5
++echo "$as_me:8416: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+-       if test "$cf_cv_xopen_source" != no ; then
++
++if test "$cf_cv_xopen_source" != no ; then
+ 
+ CFLAGS=`echo "$CFLAGS" | \
+        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+@@ -8060,7 +8426,7 @@
+        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+                -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
+ 
+-               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
++       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8140,7 +8506,7 @@
+        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+ 
+-       fi
 +fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
+ cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
+ 
+@@ -8155,16 +8521,16 @@
+        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
+                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
+ 
+-echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8524: 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 "${as_me:-configure}:8164: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8530: testing if the symbol is already defined go no further ..." 1>&5
+ 
+        cat >conftest.$ac_ext <<_ACEOF
+-#line 8167 "configure"
++#line 8533 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8179,16 +8545,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8185: \$? = $ac_status" >&5
++  echo "$as_me:8551: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8191: \$? = $ac_status" >&5
++  echo "$as_me:8557: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -8209,7 +8575,7 @@
+         esac
+         if test "$cf_want_posix_source" = yes ; then
+                cat >conftest.$ac_ext <<_ACEOF
+-#line 8212 "configure"
++#line 8578 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8224,16 +8590,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8593: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8230: \$? = $ac_status" >&5
++  echo "$as_me:8596: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8599: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8236: \$? = $ac_status" >&5
++  echo "$as_me:8602: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8244,15 +8610,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+         fi
+ 
+-echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8613: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+         CFLAGS="$cf_trim_CFLAGS"
+         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8618: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 8255 "configure"
++#line 8621 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8267,16 +8633,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8273: \$? = $ac_status" >&5
++  echo "$as_me:8639: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8279: \$? = $ac_status" >&5
++  echo "$as_me:8645: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8292,7 +8658,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8661: 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
+@@ -8362,34 +8728,298 @@
+ esac
+ done
+ 
+-if test -n "$cf_new_cflags" ; then
++if test -n "$cf_new_cflags" ; then
++
++       CFLAGS="$CFLAGS $cf_new_cflags"
 +fi
-+echo "$as_me:9139: result: $cf_cv_xopen_source" >&5
-+echo "${ECHO_T}$cf_cv_xopen_source" >&6
-+
-+if test "$cf_cv_xopen_source" != no ; then
-+
-+CFLAGS=`echo "$CFLAGS" | \
-+       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-+               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
-+CPPFLAGS=`echo "$CPPFLAGS" | \
-+       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-+               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
-+       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
++
++if test -n "$cf_new_cppflags" ; then
++
++       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
++fi
++
++fi
++
++       ;;
++esac
++
++if test -n "$cf_xopen_source" ; then
 +
 +cf_fix_cppflags=no
@@ -6356 +6696 @@
 +cf_new_extra_cppflags=
 +
-+for cf_add_cflags in $cf_temp_xopen_source
++for cf_add_cflags in $cf_xopen_source
 +do
 +case $cf_fix_cppflags in
@@ -6431 +6771 @@
 +fi
 +
++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
++       echo "$as_me:8834: checking if _XOPEN_SOURCE really is set" >&5
++echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
++       cat >conftest.$ac_ext <<_ACEOF
++#line 8837 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++int
++main ()
++{
++
++#ifndef _XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8852: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8855: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8858: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8861: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_XOPEN_SOURCE_set=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_XOPEN_SOURCE_set=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       echo "$as_me:8870: result: $cf_XOPEN_SOURCE_set" >&5
++echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
++       if test $cf_XOPEN_SOURCE_set = yes
++       then
++               cat >conftest.$ac_ext <<_ACEOF
++#line 8875 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++int
++main ()
++{
++
++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8890: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8893: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8896: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8899: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_XOPEN_SOURCE_set_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_XOPEN_SOURCE_set_ok=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++               if test $cf_XOPEN_SOURCE_set_ok = no
++               then
++                       { echo "$as_me:8910: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
++               fi
++       else
++
++echo "$as_me:8915: checking if we should define _XOPEN_SOURCE" >&5
++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
++if test "${cf_cv_xopen_source+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++       cat >conftest.$ac_ext <<_ACEOF
++#line 8922 "configure"
++#include "confdefs.h"
++
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++
++int
++main ()
++{
++
++#ifndef _XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8944: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8950: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_xopen_source=no
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_save="$CPPFLAGS"
++        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
++        cat >conftest.$ac_ext <<_ACEOF
++#line 8959 "configure"
++#include "confdefs.h"
+ 
+-       CFLAGS="$CFLAGS $cf_new_cflags"
+-fi
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
+ 
+-if test -n "$cf_new_cppflags" ; then
++int
++main ()
++{
+ 
+-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
++#ifdef _XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8978: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8981: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8984: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8987: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_xopen_source=no
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_xopen_source=$cf_XOPEN_SOURCE
+ fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CPPFLAGS="$cf_save"
+ 
+-if test -n "$cf_new_extra_cppflags" ; then
+-
+-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
++echo "$as_me:9002: result: $cf_cv_xopen_source" >&5
++echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+-       ;;
+-esac
++if test "$cf_cv_xopen_source" != no ; then
+ 
+-if test -n "$cf_xopen_source" ; then
++CFLAGS=`echo "$CFLAGS" | \
++       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++
++       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in $cf_xopen_source
++for cf_add_cflags in $cf_temp_xopen_source
+ do
+ case $cf_fix_cppflags in
+ no)
+@@ -8464,6 +9094,9 @@
+ 
+ fi
+ 
 +       fi
 +fi
@@ -6437 +6985 @@
  if test "${enable_largefile+set}" = set; then
    enableval="$enable_largefile"
-@@ -8471,7 +9241,7 @@
+@@ -8471,7 +9104,7 @@
  fi;
  if test "$enable_largefile" != no; then
  
 -  echo "$as_me:8474: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:9244: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:9107: 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
-@@ -8483,7 +9253,7 @@
+@@ -8483,7 +9116,7 @@
          # 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 8486 "configure"
-+#line 9256 "configure"
++#line 9119 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8503,16 +9273,16 @@
+@@ -8503,16 +9136,16 @@
  }
  _ACEOF
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8509: \$? = $ac_status" >&5
-+  echo "$as_me:9279: \$? = $ac_status" >&5
++  echo "$as_me:9142: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9145: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8515: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
++  echo "$as_me:9148: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8522,16 +9292,16 @@
+@@ -8522,16 +9155,16 @@
  rm -f conftest.$ac_objext
          CC="$CC -n32"
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9295: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8528: \$? = $ac_status" >&5
-+  echo "$as_me:9298: \$? = $ac_status" >&5
++  echo "$as_me:9161: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9301: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8534: \$? = $ac_status" >&5
-+  echo "$as_me:9304: \$? = $ac_status" >&5
++  echo "$as_me:9167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_CC=' -n32'; break
  else
-@@ -8545,13 +9315,13 @@
+@@ -8545,13 +9178,13 @@
         rm -f conftest.$ac_ext
      fi
  fi
 -echo "$as_me:8548: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:9318: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:9181: 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
@@ -6509 +7057 @@
  
 -  echo "$as_me:8554: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:9324: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:9187: 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
-@@ -8559,7 +9329,7 @@
+@@ -8559,7 +9192,7 @@
    while :; do
    ac_cv_sys_file_offset_bits=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8562 "configure"
-+#line 9332 "configure"
++#line 9195 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8579,16 +9349,16 @@
+@@ -8579,16 +9212,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8582: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9352: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9215: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8585: \$? = $ac_status" >&5
-+  echo "$as_me:9355: \$? = $ac_status" >&5
++  echo "$as_me:9218: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9221: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8591: \$? = $ac_status" >&5
-+  echo "$as_me:9361: \$? = $ac_status" >&5
++  echo "$as_me:9224: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8597,7 +9367,7 @@
+@@ -8597,7 +9230,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8600 "configure"
-+#line 9370 "configure"
++#line 9233 "configure"
  #include "confdefs.h"
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -8618,16 +9388,16 @@
+@@ -8618,16 +9251,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9391: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9254: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8624: \$? = $ac_status" >&5
-+  echo "$as_me:9394: \$? = $ac_status" >&5
++  echo "$as_me:9257: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9260: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8630: \$? = $ac_status" >&5
-+  echo "$as_me:9400: \$? = $ac_status" >&5
++  echo "$as_me:9263: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_file_offset_bits=64; break
  else
-@@ -8638,7 +9408,7 @@
+@@ -8638,7 +9271,7 @@
    break
  done
  fi
 -echo "$as_me:8641: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:9411: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:9274: 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
  
-@@ -8648,7 +9418,7 @@
+@@ -8648,7 +9281,7 @@
  
  fi
  rm -rf conftest*
 -  echo "$as_me:8651: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:9421: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:9284: 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
-@@ -8656,7 +9426,7 @@
+@@ -8656,7 +9289,7 @@
    while :; do
    ac_cv_sys_large_files=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8659 "configure"
-+#line 9429 "configure"
++#line 9292 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8676,16 +9446,16 @@
+@@ -8676,16 +9309,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8679: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9312: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8682: \$? = $ac_status" >&5
-+  echo "$as_me:9452: \$? = $ac_status" >&5
++  echo "$as_me:9315: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8685: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9318: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8688: \$? = $ac_status" >&5
-+  echo "$as_me:9458: \$? = $ac_status" >&5
++  echo "$as_me:9321: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8694,7 +9464,7 @@
+@@ -8694,7 +9327,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8697 "configure"
-+#line 9467 "configure"
++#line 9330 "configure"
  #include "confdefs.h"
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -8715,16 +9485,16 @@
+@@ -8715,16 +9348,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9488: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9351: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8721: \$? = $ac_status" >&5
-+  echo "$as_me:9491: \$? = $ac_status" >&5
++  echo "$as_me:9354: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9494: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9357: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8727: \$? = $ac_status" >&5
-+  echo "$as_me:9497: \$? = $ac_status" >&5
++  echo "$as_me:9360: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_large_files=1; break
  else
-@@ -8735,7 +9505,7 @@
+@@ -8735,7 +9368,7 @@
    break
  done
  fi
 -echo "$as_me:8738: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:9508: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:9371: 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
  
-@@ -8748,7 +9518,7 @@
+@@ -8748,7 +9381,7 @@
  fi
  
      if test "$enable_largefile" != no ; then
 -       echo "$as_me:8751: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+       echo "$as_me:9521: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++       echo "$as_me:9384: 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
-@@ -8756,7 +9526,7 @@
+@@ -8756,7 +9389,7 @@
    while :; do
    ac_cv_sys_largefile_source=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8759 "configure"
-+#line 9529 "configure"
++#line 9392 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8768,16 +9538,16 @@
+@@ -8768,16 +9401,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9541: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9404: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8774: \$? = $ac_status" >&5
-+  echo "$as_me:9544: \$? = $ac_status" >&5
++  echo "$as_me:9407: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9547: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9410: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8780: \$? = $ac_status" >&5
-+  echo "$as_me:9550: \$? = $ac_status" >&5
++  echo "$as_me:9413: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8786,7 +9556,7 @@
+@@ -8786,7 +9419,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8789 "configure"
-+#line 9559 "configure"
++#line 9422 "configure"
  #include "confdefs.h"
  #define _LARGEFILE_SOURCE 1
  #include <stdio.h>
-@@ -8799,16 +9569,16 @@
+@@ -8799,16 +9432,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9435: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8805: \$? = $ac_status" >&5
-+  echo "$as_me:9575: \$? = $ac_status" >&5
++  echo "$as_me:9438: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8808: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9441: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8811: \$? = $ac_status" >&5
-+  echo "$as_me:9581: \$? = $ac_status" >&5
++  echo "$as_me:9444: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_source=1; break
  else
-@@ -8819,7 +9589,7 @@
+@@ -8819,7 +9452,7 @@
    break
  done
  fi
 -echo "$as_me:8822: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:9592: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:9455: 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
  
-@@ -8833,13 +9603,13 @@
+@@ -8833,13 +9466,13 @@
  # 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:8836: checking for fseeko" >&5
-+echo "$as_me:9606: checking for fseeko" >&5
++echo "$as_me:9469: checking for fseeko" >&5
  echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
  if test "${ac_cv_func_fseeko+set}" = set; then
@@ -6750 +7298 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8842 "configure"
-+#line 9612 "configure"
++#line 9475 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8851,16 +9621,16 @@
+@@ -8851,16 +9484,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8854: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9487: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8857: \$? = $ac_status" >&5
-+  echo "$as_me:9627: \$? = $ac_status" >&5
++  echo "$as_me:9490: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8860: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9493: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8863: \$? = $ac_status" >&5
-+  echo "$as_me:9633: \$? = $ac_status" >&5
++  echo "$as_me:9496: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fseeko=yes
  else
-@@ -8870,7 +9640,7 @@
+@@ -8870,7 +9503,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:8873: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:9643: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:9506: result: $ac_cv_func_fseeko" >&5
  echo "${ECHO_T}$ac_cv_func_fseeko" >&6
  if test $ac_cv_func_fseeko = yes; then
  
-@@ -8891,14 +9661,14 @@
+@@ -8891,14 +9524,14 @@
         test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
         test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
  
 -       echo "$as_me:8894: checking whether to use struct dirent64" >&5
-+       echo "$as_me:9664: checking whether to use struct dirent64" >&5
++       echo "$as_me:9527: 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
@@ -6797 +7345 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 8901 "configure"
-+#line 9671 "configure"
++#line 9534 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -8919,16 +9689,16 @@
+@@ -8919,16 +9552,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8922: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9555: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8925: \$? = $ac_status" >&5
-+  echo "$as_me:9695: \$? = $ac_status" >&5
++  echo "$as_me:9558: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8928: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9698: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9561: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8931: \$? = $ac_status" >&5
-+  echo "$as_me:9701: \$? = $ac_status" >&5
++  echo "$as_me:9564: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_struct_dirent64=yes
  else
-@@ -8939,7 +9709,7 @@
+@@ -8939,7 +9572,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:8942: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:9712: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:9575: result: $cf_cv_struct_dirent64" >&5
  echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
         test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
  #define HAVE_STRUCT_DIRENT64 1
-@@ -8948,7 +9718,7 @@
+@@ -8948,7 +9581,7 @@
      fi
  
  ### Enable compiling-in rcs id's
 -echo "$as_me:8951: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:9721: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:9584: 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.
-@@ -8958,7 +9728,7 @@
+@@ -8958,7 +9591,7 @@
  else
    with_rcs_ids=no
  fi;
 -echo "$as_me:8961: result: $with_rcs_ids" >&5
-+echo "$as_me:9731: result: $with_rcs_ids" >&5
++echo "$as_me:9594: result: $with_rcs_ids" >&5
  echo "${ECHO_T}$with_rcs_ids" >&6
  test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
  #define USE_RCS_IDS 1
-@@ -8967,7 +9737,7 @@
+@@ -8967,7 +9600,7 @@
  ###############################################################################
  
  ### Note that some functions (such as const) are normally disabled anyway.
 -echo "$as_me:8970: checking if you want to build with function extensions" >&5
-+echo "$as_me:9740: checking if you want to build with function extensions" >&5
++echo "$as_me:9603: 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.
-@@ -8977,7 +9747,7 @@
+@@ -8977,7 +9610,7 @@
  else
    with_ext_funcs=yes
  fi;
 -echo "$as_me:8980: result: $with_ext_funcs" >&5
-+echo "$as_me:9750: result: $with_ext_funcs" >&5
++echo "$as_me:9613: result: $with_ext_funcs" >&5
  echo "${ECHO_T}$with_ext_funcs" >&6
  if test "$with_ext_funcs" = yes ; then
         NCURSES_EXT_FUNCS=1
-@@ -8994,7 +9764,7 @@
+@@ -8994,7 +9627,7 @@
  fi
  
  ###   use option --enable-const to turn on use of const beyond that in XSI.
 -echo "$as_me:8997: checking for extended use of const keyword" >&5
-+echo "$as_me:9767: checking for extended use of const keyword" >&5
++echo "$as_me:9630: 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.
-@@ -9004,7 +9774,7 @@
+@@ -9004,7 +9637,7 @@
  else
    with_ext_const=no
  fi;
 -echo "$as_me:9007: result: $with_ext_const" >&5
-+echo "$as_me:9777: result: $with_ext_const" >&5
++echo "$as_me:9640: result: $with_ext_const" >&5
  echo "${ECHO_T}$with_ext_const" >&6
  NCURSES_CONST='/*nothing*/'
  if test "$with_ext_const" = yes ; then
-@@ -9014,7 +9784,7 @@
+@@ -9014,7 +9647,7 @@
  ###############################################################################
  # These options are relatively safe to experiment with.
  
 -echo "$as_me:9017: checking if you want all development code" >&5
-+echo "$as_me:9787: checking if you want all development code" >&5
++echo "$as_me:9650: 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.
-@@ -9024,7 +9794,7 @@
+@@ -9024,7 +9657,7 @@
  else
    with_develop=no
  fi;
 -echo "$as_me:9027: result: $with_develop" >&5
-+echo "$as_me:9797: result: $with_develop" >&5
++echo "$as_me:9660: result: $with_develop" >&5
  echo "${ECHO_T}$with_develop" >&6
  
  ###############################################################################
-@@ -9033,7 +9803,7 @@
+@@ -9033,7 +9666,7 @@
  # This is still experimental (20080329), but should ultimately be moved to
  # the script-block --with-normal, etc.
  
 -echo "$as_me:9036: checking if you want to link with the pthread library" >&5
-+echo "$as_me:9806: checking if you want to link with the pthread library" >&5
++echo "$as_me:9669: 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.
-@@ -9043,27 +9813,27 @@
+@@ -9043,27 +9676,27 @@
  else
    with_pthread=no
  fi;
 -echo "$as_me:9046: result: $with_pthread" >&5
-+echo "$as_me:9816: result: $with_pthread" >&5
++echo "$as_me:9679: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  
  if test "$with_pthread" != no ; then
 -    echo "$as_me:9050: checking for pthread.h" >&5
-+    echo "$as_me:9820: checking for pthread.h" >&5
++    echo "$as_me:9683: 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
@@ -6929 +7477 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9056 "configure"
-+#line 9826 "configure"
++#line 9689 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  _ACEOF
 -if { (eval echo "$as_me:9060: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9830: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9693: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -6941 +7489 @@
    cat conftest.err >&5
 -  echo "$as_me:9066: \$? = $ac_status" >&5
-+  echo "$as_me:9836: \$? = $ac_status" >&5
++  echo "$as_me:9699: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9082,7 +9852,7 @@
+@@ -9082,7 +9715,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:9085: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:9855: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:9718: result: $ac_cv_header_pthread_h" >&5
  echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
  if test $ac_cv_header_pthread_h = yes; then
  
-@@ -9090,12 +9860,14 @@
+@@ -9090,12 +9723,14 @@
  #define HAVE_PTHREADS_H 1
  EOF
@@ -6966 +7514 @@
 +       for cf_lib_pthread in pthread c_r
 +       do
-+           echo "$as_me:9865: checking if we can link with the $cf_lib_pthread library" >&5
++           echo "$as_me:9728: 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"
 +           LIBS="-l$cf_lib_pthread $LIBS"
 +           cat >conftest.$ac_ext <<_ACEOF
-+#line 9870 "configure"
++#line 9733 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -9104,23 +9876,24 @@
+@@ -9104,23 +9739,24 @@
  main ()
  {
@@ -6989 +7537 @@
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9114: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9887: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9750: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9117: \$? = $ac_status" >&5
-+  echo "$as_me:9890: \$? = $ac_status" >&5
++  echo "$as_me:9753: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9120: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9756: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9123: \$? = $ac_status" >&5
-+  echo "$as_me:9896: \$? = $ac_status" >&5
++  echo "$as_me:9759: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_pthread=yes
  else
-@@ -9129,27 +9902,29 @@
+@@ -9129,27 +9765,29 @@
  with_pthread=no
  fi
@@ -7012 +7560 @@
 -        echo "$as_me:9133: result: $with_pthread" >&5
 +           LIBS="$cf_save_LIBS"
-+           echo "$as_me:9906: result: $with_pthread" >&5
++           echo "$as_me:9769: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
 +           test "$with_pthread" = yes && break
@@ -7029 +7577 @@
 -            { { echo "$as_me:9143: error: Cannot link with pthread library" >&5
 +       else
-+           { { echo "$as_me:9918: error: Cannot link with pthread library" >&5
++           { { echo "$as_me:9781: error: Cannot link with pthread library" >&5
  echo "$as_me: error: Cannot link with pthread library" >&2;}
     { (exit 1); exit 1; }; }
@@ -7040 +7588 @@
  
 -echo "$as_me:9152: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:9927: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:9790: 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.
-@@ -9159,18 +9934,18 @@
+@@ -9159,18 +9797,18 @@
  else
    use_weak_symbols=no
  fi;
 -echo "$as_me:9162: result: $use_weak_symbols" >&5
-+echo "$as_me:9937: result: $use_weak_symbols" >&5
++echo "$as_me:9800: result: $use_weak_symbols" >&5
  echo "${ECHO_T}$use_weak_symbols" >&6
  if test "$use_weak_symbols" = yes ; then
  
 -echo "$as_me:9166: checking if $CC supports weak symbols" >&5
-+echo "$as_me:9941: checking if $CC supports weak symbols" >&5
++echo "$as_me:9804: 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
@@ -7062 +7610 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9173 "configure"
-+#line 9948 "configure"
++#line 9811 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -9196,16 +9971,16 @@
+@@ -9196,16 +9834,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9199: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9837: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9202: \$? = $ac_status" >&5
-+  echo "$as_me:9977: \$? = $ac_status" >&5
++  echo "$as_me:9840: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9205: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9843: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9208: \$? = $ac_status" >&5
-+  echo "$as_me:9983: \$? = $ac_status" >&5
++  echo "$as_me:9846: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_weak_symbols=yes
  else
-@@ -9216,7 +9991,7 @@
+@@ -9216,7 +9854,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:9219: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:9994: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:9857: result: $cf_cv_weak_symbols" >&5
  echo "${ECHO_T}$cf_cv_weak_symbols" >&6
  
  else
-@@ -9243,13 +10018,13 @@
+@@ -9243,13 +9881,13 @@
  fi
  
  # OpenSUSE is installing ncurses6, using reentrant option.
 -echo "$as_me:9246: checking for _nc_TABSIZE" >&5
-+echo "$as_me:10021: checking for _nc_TABSIZE" >&5
++echo "$as_me:9884: 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
@@ -7108 +7656 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9252 "configure"
-+#line 10027 "configure"
++#line 9890 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _nc_TABSIZE (); below.  */
-@@ -9280,16 +10055,16 @@
+@@ -9272,7 +9910,7 @@
+ #if defined (__stub__nc_TABSIZE) || defined (__stub____nc_TABSIZE)
+ choke me
+ #else
+-f = _nc_TABSIZE;
++f = _nc_TABSIZE; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -9280,16 +9918,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9283: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9921: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9286: \$? = $ac_status" >&5
-+  echo "$as_me:10061: \$? = $ac_status" >&5
++  echo "$as_me:9924: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9927: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9292: \$? = $ac_status" >&5
-+  echo "$as_me:10067: \$? = $ac_status" >&5
++  echo "$as_me:9930: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func__nc_TABSIZE=yes
  else
-@@ -9299,7 +10074,7 @@
+@@ -9299,7 +9937,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9302: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:10077: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:9940: result: $ac_cv_func__nc_TABSIZE" >&5
  echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
  if test $ac_cv_func__nc_TABSIZE = yes; then
    assume_reentrant=yes
-@@ -9311,7 +10086,7 @@
+@@ -9311,7 +9949,7 @@
  # 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:9314: checking if you want experimental reentrant code" >&5
-+echo "$as_me:10089: checking if you want experimental reentrant code" >&5
++echo "$as_me:9952: 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.
-@@ -9321,7 +10096,7 @@
+@@ -9321,7 +9959,7 @@
  else
    with_reentrant=$assume_reentrant
  fi;
 -echo "$as_me:9324: result: $with_reentrant" >&5
-+echo "$as_me:10099: result: $with_reentrant" >&5
++echo "$as_me:9962: result: $with_reentrant" >&5
  echo "${ECHO_T}$with_reentrant" >&6
  if test "$with_reentrant" = yes ; then
         cf_cv_enable_reentrant=1
-@@ -9343,7 +10118,7 @@
+@@ -9343,7 +9981,7 @@
  
  ### Allow using a different wrap-prefix
  if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 -       echo "$as_me:9346: checking for prefix used to wrap public variables" >&5
-+       echo "$as_me:10121: checking for prefix used to wrap public variables" >&5
++       echo "$as_me:9984: 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.
-@@ -9353,7 +10128,7 @@
+@@ -9353,7 +9991,7 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
 -       echo "$as_me:9356: result: $NCURSES_WRAP_PREFIX" >&5
-+       echo "$as_me:10131: result: $NCURSES_WRAP_PREFIX" >&5
++       echo "$as_me:9994: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  else
         NCURSES_WRAP_PREFIX=_nc_
-@@ -9366,7 +10141,7 @@
+@@ -9366,26 +10004,46 @@
  ###############################################################################
  
  ###    use option --disable-echo to suppress full display compiling commands
 -echo "$as_me:9369: checking if you want to display full commands during build" >&5
-+echo "$as_me:10144: checking if you want to display full commands during build" >&5
- echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
+-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
++
++echo "$as_me:10008: 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.
-@@ -9381,11 +10156,11 @@
+ if test "${enable_echo+set}" = set; then
+   enableval="$enable_echo"
+-  with_echo=$enableval
++  test "$enableval" != no && enableval=yes
++  if test "$enableval" != "yes" ; then
++
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking $@;'
++    RULE_CC='@echo compiling $<'
++    SHOW_CC='@echo compiling $@'
++    ECHO_CC='@'
++
++  else
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
++  fi
  else
-        ECHO_LINK='@ echo linking $@ ... ;'
- fi
+-  with_echo=yes
++  enableval=yes
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
+ fi;
+-if test "$with_echo" = yes; then
+-       ECHO_LINK=
+-else
+-       ECHO_LINK='@ echo linking $@ ... ;'
+-fi
 -echo "$as_me:9384: result: $with_echo" >&5
-+echo "$as_me:10159: result: $with_echo" >&5
- echo "${ECHO_T}$with_echo" >&6
+-echo "${ECHO_T}$with_echo" >&6
++echo "$as_me:10042: result: $enableval" >&5
++echo "${ECHO_T}$enableval" >&6
  
  ###    use option --enable-warnings to turn on all gcc warnings
 -echo "$as_me:9388: checking if you want to see compiler warnings" >&5
-+echo "$as_me:10163: checking if you want to see compiler warnings" >&5
++echo "$as_me:10046: 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.
-@@ -9393,7 +10168,7 @@
+@@ -9393,7 +10051,7 @@
    enableval="$enable_warnings"
    with_warnings=$enableval
  fi;
 -echo "$as_me:9396: result: $with_warnings" >&5
-+echo "$as_me:10171: result: $with_warnings" >&5
++echo "$as_me:10054: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  
  if test "x$with_warnings" = "xyes"; then
-@@ -9405,12 +10180,12 @@
+@@ -9405,12 +10063,12 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:9408: checking if this is really Intel C compiler" >&5
-+               echo "$as_me:10183: checking if this is really Intel C compiler" >&5
++               echo "$as_me:10066: 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"
@@ -7221 +7814 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 9413 "configure"
-+#line 10188 "configure"
++#line 10071 "configure"
  #include "confdefs.h"
  
  int
-@@ -9427,16 +10202,16 @@
+@@ -9427,16 +10085,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9430: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10088: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9433: \$? = $ac_status" >&5
-+  echo "$as_me:10208: \$? = $ac_status" >&5
++  echo "$as_me:10091: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9436: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10094: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9439: \$? = $ac_status" >&5
-+  echo "$as_me:10214: \$? = $ac_status" >&5
++  echo "$as_me:10097: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -9447,14 +10222,14 @@
+@@ -9447,14 +10105,63 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 CFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:9450: result: $INTEL_COMPILER" >&5
-+               echo "$as_me:10225: result: $INTEL_COMPILER" >&5
++               echo "$as_me:10108: result: $INTEL_COMPILER" >&5
  echo "${ECHO_T}$INTEL_COMPILER" >&6
                 ;;
@@ -7257 +7850 @@
  fi
  
++CLANG_COMPILER=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:10117: checking if this is really Clang C compiler" >&5
++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CFLAGS"
++       CFLAGS="$CFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 10122 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __clang__
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:10139: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:10142: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:10145: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:10148: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  CLANG_COMPILER=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:10159: result: $CLANG_COMPILER" >&5
++echo "${ECHO_T}$CLANG_COMPILER" >&6
++fi
++
  cat > conftest.$ac_ext <<EOF
 -#line 9457 "${as_me:-configure}"
-+#line 10232 "${as_me:-configure}"
++#line 10164 "${as_me:-configure}"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -9471,7 +10246,7 @@
+@@ -9471,7 +10178,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #279: controlling expression is constant
  
 -       { echo "$as_me:9474: checking for $CC warning options..." >&5
-+       { echo "$as_me:10249: checking for $CC warning options..." >&5
++       { echo "$as_me:10181: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS="-Wall"
-@@ -9487,12 +10262,12 @@
+@@ -9487,12 +10194,12 @@
                 wd981
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:10265: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9493: \$? = $ac_status" >&5
-+  echo "$as_me:10268: \$? = $ac_status" >&5
++  echo "$as_me:10200: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:9495: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:10270: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:10202: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                 fi
-@@ -9501,7 +10276,7 @@
+@@ -9501,7 +10208,7 @@
  
  elif test "$GCC" = yes
  then
 -       { echo "$as_me:9504: checking for $CC warning options..." >&5
-+       { echo "$as_me:10279: checking for $CC warning options..." >&5
++       { echo "$as_me:10211: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS=
-@@ -9521,12 +10296,12 @@
+@@ -9521,12 +10228,12 @@
                 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:10231: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9527: \$? = $ac_status" >&5
-+  echo "$as_me:10302: \$? = $ac_status" >&5
++  echo "$as_me:10234: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:9529: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:10304: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:10236: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         case $cf_opt in #(vi
                         Wcast-qual) #(vi
-@@ -9537,7 +10312,7 @@
+@@ -9537,7 +10244,17 @@
                                 [34].*)
                                         test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
  
 -echo "${as_me:-configure}:9540: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:10315: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:10247: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++
++                                       continue;;
++                               esac
++                               ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [12].*)
++                                       test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
++
++echo "${as_me:-configure}:10257: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
                                         continue;;
                                 esac
-@@ -9570,10 +10345,10 @@
+@@ -9570,10 +10287,10 @@
  EOF
  if test "$GCC" = yes
  then
 -       { echo "$as_me:9573: checking for $CC __attribute__ directives..." >&5
-+       { echo "$as_me:10348: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:10290: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <<EOF
 -#line 9576 "${as_me:-configure}"
-+#line 10351 "${as_me:-configure}"
++#line 10293 "${as_me:-configure}"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
-@@ -9622,12 +10397,12 @@
+@@ -9622,12 +10339,12 @@
                         ;;
                 esac
  
 -               if { (eval echo "$as_me:9625: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:10400: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:10342: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9628: \$? = $ac_status" >&5
-+  echo "$as_me:10403: \$? = $ac_status" >&5
++  echo "$as_me:10345: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:9630: result: ... $cf_attribute" >&5
-+                       test -n "$verbose" && echo "$as_me:10405: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:10347: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
                         cat conftest.h >>confdefs.h
                         case $cf_attribute in #(vi
-@@ -9663,7 +10438,7 @@
+@@ -9663,7 +10380,7 @@
  fi
  
  ###    use option --enable-assertions to turn on generation of assertion code
 -echo "$as_me:9666: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:10441: checking if you want to enable runtime assertions" >&5
++echo "$as_me:10383: 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.
-@@ -9673,7 +10448,7 @@
+@@ -9673,16 +10390,12 @@
  else
    with_assertions=no
  fi;
 -echo "$as_me:9676: result: $with_assertions" >&5
-+echo "$as_me:10451: result: $with_assertions" >&5
++echo "$as_me:10393: result: $with_assertions" >&5
  echo "${ECHO_T}$with_assertions" >&6
  if test -n "$GCC"
  then
-@@ -9727,7 +10502,7 @@
+        if test "$with_assertions" = no
+        then
+-               cat >>confdefs.h <<\EOF
+-#define NDEBUG 1
+-EOF
+-
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+ 
+@@ -9727,7 +10440,7 @@
         ;;
  esac
  
 -echo "$as_me:9730: checking whether to add trace feature to all models" >&5
-+echo "$as_me:10505: checking whether to add trace feature to all models" >&5
++echo "$as_me:10443: 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.
-@@ -9737,7 +10512,7 @@
+@@ -9737,7 +10450,7 @@
  else
    cf_with_trace=$cf_all_traces
  fi;
 -echo "$as_me:9740: result: $cf_with_trace" >&5
-+echo "$as_me:10515: result: $cf_with_trace" >&5
++echo "$as_me:10453: result: $cf_with_trace" >&5
  echo "${ECHO_T}$cf_with_trace" >&6
  
  if test "$cf_with_trace" = yes ; then
-@@ -9830,13 +10605,13 @@
+@@ -9830,13 +10543,13 @@
  *mingw32*) #(vi
         ;;
  *)
 -echo "$as_me:9833: checking for gettimeofday" >&5
-+echo "$as_me:10608: checking for gettimeofday" >&5
++echo "$as_me:10546: checking for gettimeofday" >&5
  echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
  if test "${ac_cv_func_gettimeofday+set}" = set; then
@@ -7399 +8060 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9839 "configure"
-+#line 10614 "configure"
++#line 10552 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettimeofday (); below.  */
-@@ -9867,16 +10642,16 @@
+@@ -9859,7 +10572,7 @@
+ #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday)
+ choke me
+ #else
+-f = gettimeofday;
++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -9867,16 +10580,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9870: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10583: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9873: \$? = $ac_status" >&5
-+  echo "$as_me:10648: \$? = $ac_status" >&5
++  echo "$as_me:10586: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9876: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10589: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9879: \$? = $ac_status" >&5
-+  echo "$as_me:10654: \$? = $ac_status" >&5
++  echo "$as_me:10592: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gettimeofday=yes
  else
-@@ -9886,7 +10661,7 @@
+@@ -9886,7 +10599,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9889: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:10664: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:10602: result: $ac_cv_func_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
  if test $ac_cv_func_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -9895,7 +10670,7 @@
+@@ -9895,7 +10608,7 @@
  
  else
  
 -echo "$as_me:9898: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:10673: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:10611: 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
-@@ -9903,7 +10678,7 @@
+@@ -9903,7 +10616,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9906 "configure"
-+#line 10681 "configure"
++#line 10619 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9922,16 +10697,16 @@
+@@ -9922,16 +10635,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10638: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9928: \$? = $ac_status" >&5
-+  echo "$as_me:10703: \$? = $ac_status" >&5
++  echo "$as_me:10641: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10644: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9934: \$? = $ac_status" >&5
-+  echo "$as_me:10709: \$? = $ac_status" >&5
++  echo "$as_me:10647: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gettimeofday=yes
  else
-@@ -9942,7 +10717,7 @@
+@@ -9942,7 +10655,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:9945: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:10720: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:10658: result: $ac_cv_lib_bsd_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
  if test $ac_cv_lib_bsd_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -9957,13 +10732,13 @@
+@@ -9957,13 +10670,13 @@
  esac
  
  ###    Checks for header files.
 -echo "$as_me:9960: checking for ANSI C header files" >&5
-+echo "$as_me:10735: checking for ANSI C header files" >&5
++echo "$as_me:10673: 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
@@ -7493 +8163 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9966 "configure"
-+#line 10741 "configure"
++#line 10679 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -9971,13 +10746,13 @@
+@@ -9971,13 +10684,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:9974: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10749: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10687: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -7509 +8179 @@
    cat conftest.err >&5
 -  echo "$as_me:9980: \$? = $ac_status" >&5
-+  echo "$as_me:10755: \$? = $ac_status" >&5
++  echo "$as_me:10693: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9999,7 +10774,7 @@
+@@ -9999,7 +10712,7 @@
  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 10002 "configure"
-+#line 10777 "configure"
++#line 10715 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -10017,7 +10792,7 @@
+@@ -10017,7 +10730,7 @@
  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 10020 "configure"
-+#line 10795 "configure"
++#line 10733 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -10038,7 +10813,7 @@
+@@ -10038,7 +10751,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10041 "configure"
-+#line 10816 "configure"
++#line 10754 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -10064,15 +10839,15 @@
+@@ -10064,15 +10777,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10067: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10780: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10070: \$? = $ac_status" >&5
-+  echo "$as_me:10845: \$? = $ac_status" >&5
++  echo "$as_me:10783: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10072: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10785: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10075: \$? = $ac_status" >&5
-+  echo "$as_me:10850: \$? = $ac_status" >&5
++  echo "$as_me:10788: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -10085,7 +10860,7 @@
+@@ -10085,7 +10798,7 @@
  fi
  fi
  fi
 -echo "$as_me:10088: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:10863: result: $ac_cv_header_stdc" >&5
++echo "$as_me:10801: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -10098,13 +10873,13 @@
+@@ -10098,13 +10811,13 @@
  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:10101: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:10876: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:10814: 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
@@ -7581 +8251 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10107 "configure"
-+#line 10882 "configure"
++#line 10820 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -10119,16 +10894,16 @@
+@@ -10119,16 +10832,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10125: \$? = $ac_status" >&5
-+  echo "$as_me:10900: \$? = $ac_status" >&5
++  echo "$as_me:10838: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10128: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10131: \$? = $ac_status" >&5
-+  echo "$as_me:10906: \$? = $ac_status" >&5
++  echo "$as_me:10844: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -10138,7 +10913,7 @@
+@@ -10138,7 +10851,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10141: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:10916: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:10854: 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
-@@ -10151,7 +10926,7 @@
+@@ -10151,7 +10864,7 @@
  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:10154: checking for opendir in -ldir" >&5
-+  echo "$as_me:10929: checking for opendir in -ldir" >&5
++  echo "$as_me:10867: 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
-@@ -10159,7 +10934,7 @@
+@@ -10159,7 +10872,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldir  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10162 "configure"
-+#line 10937 "configure"
++#line 10875 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10178,16 +10953,16 @@
+@@ -10178,16 +10891,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10181: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10894: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10184: \$? = $ac_status" >&5
-+  echo "$as_me:10959: \$? = $ac_status" >&5
++  echo "$as_me:10897: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10187: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10900: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10190: \$? = $ac_status" >&5
-+  echo "$as_me:10965: \$? = $ac_status" >&5
++  echo "$as_me:10903: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dir_opendir=yes
  else
-@@ -10198,14 +10973,14 @@
+@@ -10198,14 +10911,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10201: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:10976: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:10914: result: $ac_cv_lib_dir_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
  if test $ac_cv_lib_dir_opendir = yes; then
@@ -7667 +8337 @@
  else
 -  echo "$as_me:10208: checking for opendir in -lx" >&5
-+  echo "$as_me:10983: checking for opendir in -lx" >&5
++  echo "$as_me:10921: 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
-@@ -10213,7 +10988,7 @@
+@@ -10213,7 +10926,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lx  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10216 "configure"
-+#line 10991 "configure"
++#line 10929 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10232,16 +11007,16 @@
+@@ -10232,16 +10945,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10235: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10948: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10238: \$? = $ac_status" >&5
-+  echo "$as_me:11013: \$? = $ac_status" >&5
++  echo "$as_me:10951: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10241: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10954: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10244: \$? = $ac_status" >&5
-+  echo "$as_me:11019: \$? = $ac_status" >&5
++  echo "$as_me:10957: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_x_opendir=yes
  else
-@@ -10252,7 +11027,7 @@
+@@ -10252,7 +10965,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10255: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:11030: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:10968: result: $ac_cv_lib_x_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
  if test $ac_cv_lib_x_opendir = yes; then
    LIBS="$LIBS -lx"
-@@ -10260,13 +11035,13 @@
+@@ -10260,13 +10973,13 @@
  
  fi
  
 -echo "$as_me:10263: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:11038: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:10976: 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
@@ -7722 +8392 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10269 "configure"
-+#line 11044 "configure"
++#line 10982 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -10282,16 +11057,16 @@
+@@ -10282,16 +10995,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10998: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10288: \$? = $ac_status" >&5
-+  echo "$as_me:11063: \$? = $ac_status" >&5
++  echo "$as_me:11001: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10294: \$? = $ac_status" >&5
-+  echo "$as_me:11069: \$? = $ac_status" >&5
++  echo "$as_me:11007: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -10301,7 +11076,7 @@
+@@ -10301,7 +11014,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10304: result: $ac_cv_header_time" >&5
-+echo "$as_me:11079: result: $ac_cv_header_time" >&5
++echo "$as_me:11017: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -10319,7 +11094,7 @@
+@@ -10319,7 +11032,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
  
 -echo "$as_me:10322: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:11097: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:11035: 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
-@@ -10327,7 +11102,7 @@
+@@ -10327,7 +11040,7 @@
    ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10330 "configure"
-+#line 11105 "configure"
++#line 11043 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
-@@ -10376,16 +11151,16 @@
+@@ -10376,16 +11089,16 @@
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10382: \$? = $ac_status" >&5
-+  echo "$as_me:11157: \$? = $ac_status" >&5
++  echo "$as_me:11095: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10385: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11098: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10388: \$? = $ac_status" >&5
-+  echo "$as_me:11163: \$? = $ac_status" >&5
++  echo "$as_me:11101: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_stdc=$ac_arg
  break
-@@ -10402,21 +11177,21 @@
+@@ -10402,21 +11115,21 @@
  
  case "x$ac_cv_prog_cc_stdc" in
    x|xno)
 -    echo "$as_me:10405: result: none needed" >&5
-+    echo "$as_me:11180: result: none needed" >&5
++    echo "$as_me:11118: result: none needed" >&5
  echo "${ECHO_T}none needed" >&6 ;;
    *)
 -    echo "$as_me:10408: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:11183: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:11121: result: $ac_cv_prog_cc_stdc" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
      CC="$CC $ac_cv_prog_cc_stdc" ;;
@@ -7810 +8480 @@
  
 -echo "$as_me:10413: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:11188: checking for an ANSI C-conforming const" >&5
++echo "$as_me:11126: 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
@@ -7817 +8487 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10419 "configure"
-+#line 11194 "configure"
++#line 11132 "configure"
  #include "confdefs.h"
  
  int
-@@ -10474,16 +11249,16 @@
+@@ -10474,16 +11187,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10480: \$? = $ac_status" >&5
-+  echo "$as_me:11255: \$? = $ac_status" >&5
++  echo "$as_me:11193: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10486: \$? = $ac_status" >&5
-+  echo "$as_me:11261: \$? = $ac_status" >&5
++  echo "$as_me:11199: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -10493,7 +11268,7 @@
+@@ -10493,7 +11206,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10496: result: $ac_cv_c_const" >&5
-+echo "$as_me:11271: result: $ac_cv_c_const" >&5
++echo "$as_me:11209: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -10505,7 +11280,7 @@
+@@ -10505,7 +11218,7 @@
  
  ###    Checks for external-data
  
 -echo "$as_me:10508: checking if data-only library module links" >&5
-+echo "$as_me:11283: checking if data-only library module links" >&5
++echo "$as_me:11221: 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
-@@ -10513,20 +11288,20 @@
+@@ -10513,20 +11226,20 @@
  
         rm -f conftest.a
         cat >conftest.$ac_ext <<EOF
 -#line 10516 "configure"
-+#line 11291 "configure"
++#line 11229 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -       if { (eval echo "$as_me:10519: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:11294: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:11232: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10522: \$? = $ac_status" >&5
-+  echo "$as_me:11297: \$? = $ac_status" >&5
++  echo "$as_me:11235: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                 mv conftest.o data.o && \
@@ -7881 +8551 @@
         cat >conftest.$ac_ext <<EOF
 -#line 10529 "configure"
-+#line 11304 "configure"
++#line 11242 "configure"
  int    testfunc()
  {
  #if defined(NeXT)
-@@ -10539,10 +11314,10 @@
+@@ -10539,10 +11252,10 @@
  #endif
  }
  EOF
 -       if { (eval echo "$as_me:10542: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:11317: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:11255: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10545: \$? = $ac_status" >&5
-+  echo "$as_me:11320: \$? = $ac_status" >&5
++  echo "$as_me:11258: \$? = $ac_status" >&5
    (exit $ac_status); }; then
                 mv conftest.o func.o && \
                 ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -10555,7 +11330,7 @@
+@@ -10555,7 +11268,7 @@
    cf_cv_link_dataonly=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10558 "configure"
-+#line 11333 "configure"
++#line 11271 "configure"
  #include "confdefs.h"
  
         int main()
-@@ -10566,15 +11341,15 @@
+@@ -10566,15 +11279,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11344: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11282: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10572: \$? = $ac_status" >&5
-+  echo "$as_me:11347: \$? = $ac_status" >&5
++  echo "$as_me:11285: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11287: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10577: \$? = $ac_status" >&5
-+  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11290: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_link_dataonly=yes
  else
-@@ -10589,7 +11364,7 @@
+@@ -10589,7 +11302,7 @@
  
  fi
  
 -echo "$as_me:10592: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:11367: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:11305: result: $cf_cv_link_dataonly" >&5
  echo "${ECHO_T}$cf_cv_link_dataonly" >&6
  
  if test "$cf_cv_link_dataonly" = no ; then
-@@ -10602,7 +11377,7 @@
+@@ -10602,7 +11315,7 @@
  
  ###    Checks for library functions.
  
 -echo "$as_me:10605: checking for working mkstemp" >&5
-+echo "$as_me:11380: checking for working mkstemp" >&5
++echo "$as_me:11318: 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
-@@ -10610,13 +11385,13 @@
+@@ -10610,68 +11323,10 @@
  
  rm -rf conftest*
  if test "$cross_compiling" = yes; then
 -  echo "$as_me:10613: checking for mkstemp" >&5
-+  echo "$as_me:11388: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+-if test "${ac_cv_func_mkstemp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line 10619 "configure"
-+#line 11394 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -10647,16 +11422,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char mkstemp (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char mkstemp ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
+-choke me
+-#else
+-f = mkstemp;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11425: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:10653: \$? = $ac_status" >&5
-+  echo "$as_me:11428: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
 -  echo "$as_me:10659: \$? = $ac_status" >&5
-+  echo "$as_me:11434: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -10666,12 +11441,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_mkstemp=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_mkstemp=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
 -echo "$as_me:10669: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:11444: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
+-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+-
++  cf_cv_func_mkstemp=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10674 "configure"
-+#line 11449 "configure"
++#line 11329 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -10709,15 +11484,15 @@
+@@ -10709,15 +11364,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10712: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11367: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10715: \$? = $ac_status" >&5
-+  echo "$as_me:11490: \$? = $ac_status" >&5
++  echo "$as_me:11370: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10717: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11372: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10720: \$? = $ac_status" >&5
-+  echo "$as_me:11495: \$? = $ac_status" >&5
++  echo "$as_me:11375: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_mkstemp=yes
  
-@@ -10732,7 +11507,7 @@
+@@ -10732,8 +11387,69 @@
  fi
  
  fi
 -echo "$as_me:10735: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:11510: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:11390: result: $cf_cv_func_mkstemp" >&5
  echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       echo "$as_me:11393: checking for mkstemp" >&5
++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
++if test "${ac_cv_func_mkstemp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11399 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char mkstemp (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char mkstemp ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
++choke me
++#else
++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:11430: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:11433: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:11436: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:11439: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mkstemp=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_cv_func_mkstemp=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:11449: result: $ac_cv_func_mkstemp" >&5
++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
++
++fi
  if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
         cat >>confdefs.h <<\EOF
-@@ -10741,13 +11516,13 @@
+ #define HAVE_MKSTEMP 1
+@@ -10741,13 +11457,13 @@
  
  fi
  
 -echo "$as_me:10744: checking return type of signal handlers" >&5
-+echo "$as_me:11519: checking return type of signal handlers" >&5
++echo "$as_me:11460: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
  if test "${ac_cv_type_signal+set}" = set; then
@@ -8038 +8789 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10750 "configure"
-+#line 11525 "configure"
++#line 11466 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -10769,16 +11544,16 @@
+@@ -10769,16 +11485,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11547: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10775: \$? = $ac_status" >&5
-+  echo "$as_me:11550: \$? = $ac_status" >&5
++  echo "$as_me:11491: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10778: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11494: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10781: \$? = $ac_status" >&5
-+  echo "$as_me:11556: \$? = $ac_status" >&5
++  echo "$as_me:11497: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signal=void
  else
-@@ -10788,7 +11563,7 @@
+@@ -10788,7 +11504,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10791: result: $ac_cv_type_signal" >&5
-+echo "$as_me:11566: result: $ac_cv_type_signal" >&5
++echo "$as_me:11507: result: $ac_cv_type_signal" >&5
  echo "${ECHO_T}$ac_cv_type_signal" >&6
  
  cat >>confdefs.h <<EOF
-@@ -10800,12 +11575,13 @@
+@@ -10800,12 +11516,13 @@
         CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
  fi
@@ -8083 +8834 @@
  set dummy $cf_ada_make; ac_word=$2
 -echo "$as_me:10808: checking for $ac_word" >&5
-+echo "$as_me:11584: checking for $ac_word" >&5
++echo "$as_me:11525: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_gnat_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10820,7 +11596,7 @@
+@@ -10820,7 +11537,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_gnat_exists="yes"
 -echo "$as_me:10823: found $ac_dir/$ac_word" >&5
-+echo "$as_me:11599: found $ac_dir/$ac_word" >&5
++echo "$as_me:11540: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -10829,31 +11605,32 @@
+@@ -10829,31 +11546,32 @@
  fi
  gnat_exists=$ac_cv_prog_gnat_exists
  if test -n "$gnat_exists"; then
 -  echo "$as_me:10832: result: $gnat_exists" >&5
-+  echo "$as_me:11608: result: $gnat_exists" >&5
++  echo "$as_me:11549: result: $gnat_exists" >&5
  echo "${ECHO_T}$gnat_exists" >&6
  else
 -  echo "$as_me:10835: result: no" >&5
-+  echo "$as_me:11611: result: no" >&5
++  echo "$as_me:11552: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -8115 +8866 @@
  
 -echo "$as_me:10843: checking for gnat version" >&5
-+echo "$as_me:11620: checking for gnat version" >&5
++echo "$as_me:11561: checking for gnat version" >&5
  echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
  cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
@@ -8121 +8872 @@
      sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 -echo "$as_me:10848: result: $cf_gnat_version" >&5
-+echo "$as_me:11625: result: $cf_gnat_version" >&5
++echo "$as_me:11566: result: $cf_gnat_version" >&5
  echo "${ECHO_T}$cf_gnat_version" >&6
  
@@ -8131 +8882 @@
  *)
 -       { echo "$as_me:10856: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+       { echo "$as_me:11633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++       { echo "$as_me:11574: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
  echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
         cf_cv_prog_gnat_correct=no
         ;;
-@@ -10861,7 +11638,7 @@
+@@ -10861,7 +11579,7 @@
  
     # Extract the first word of "m4", so it can be a program name with args.
  set dummy m4; ac_word=$2
 -echo "$as_me:10864: checking for $ac_word" >&5
-+echo "$as_me:11641: checking for $ac_word" >&5
++echo "$as_me:11582: 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
-@@ -10876,7 +11653,7 @@
+@@ -10876,7 +11594,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_M4_exists="yes"
 -echo "$as_me:10879: found $ac_dir/$ac_word" >&5
-+echo "$as_me:11656: found $ac_dir/$ac_word" >&5
++echo "$as_me:11597: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -10885,10 +11662,10 @@
+@@ -10885,10 +11603,10 @@
  fi
  M4_exists=$ac_cv_prog_M4_exists
  if test -n "$M4_exists"; then
 -  echo "$as_me:10888: result: $M4_exists" >&5
-+  echo "$as_me:11665: result: $M4_exists" >&5
++  echo "$as_me:11606: result: $M4_exists" >&5
  echo "${ECHO_T}$M4_exists" >&6
  else
 -  echo "$as_me:10891: result: no" >&5
-+  echo "$as_me:11668: result: no" >&5
++  echo "$as_me:11609: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -10897,7 +11674,7 @@
+@@ -10897,7 +11615,7 @@
        echo Ada95 binding required program m4 not found. Ada95 binding disabled.
     fi
     if test "$cf_cv_prog_gnat_correct" = yes; then
 -      echo "$as_me:10900: checking if GNAT works" >&5
-+      echo "$as_me:11677: checking if GNAT works" >&5
++      echo "$as_me:11618: checking if GNAT works" >&5
  echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
  
  rm -rf conftest* *~conftest*
-@@ -10925,7 +11702,7 @@
+@@ -10925,30 +11643,34 @@
  fi
  rm -rf conftest* *~conftest*
  
 -      echo "$as_me:10928: result: $cf_cv_prog_gnat_correct" >&5
-+      echo "$as_me:11705: result: $cf_cv_prog_gnat_correct" >&5
++      echo "$as_me:11646: result: $cf_cv_prog_gnat_correct" >&5
  echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
     fi
  fi
-@@ -10948,7 +11725,7 @@
-                        ;;
-                esac
+ 
+        if test "$cf_cv_prog_gnat_correct" = yes; then
+ 
+-               # make ADAFLAGS consistent with CFLAGS
+-               case "$CFLAGS" in
+-               *-g*)
++       echo "$as_me:11653: checking optimization options for ADAFLAGS" >&5
++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
++       case "$CFLAGS" in
++       *-g*)
+ 
+        ADAFLAGS="$ADAFLAGS -g"
+ 
+-                       ;;
+-               esac
+-               case "$CFLAGS" in
+-               *-O*)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[         ].*//'`
+ 
+-       ADAFLAGS="$ADAFLAGS -O3"
++       ADAFLAGS="$ADAFLAGS $cf_O_flag"
+ 
+-                       ;;
+-               esac
++               ;;
++       esac
++       echo "$as_me:11670: result: $ADAFLAGS" >&5
++echo "${ECHO_T}$ADAFLAGS" >&6
  
 -echo "$as_me:10951: checking if GNAT supports generics" >&5
-+echo "$as_me:11728: checking if GNAT supports generics" >&5
++echo "$as_me:11673: checking if GNAT supports generics" >&5
  echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[1-9]*|[4-9].*) #(vi
-@@ -10958,7 +11735,7 @@
+@@ -10958,7 +11680,7 @@
         cf_gnat_generics=no
         ;;
  esac
 -echo "$as_me:10961: result: $cf_gnat_generics" >&5
-+echo "$as_me:11738: result: $cf_gnat_generics" >&5
++echo "$as_me:11683: result: $cf_gnat_generics" >&5
  echo "${ECHO_T}$cf_gnat_generics" >&6
  
  if test "$cf_gnat_generics" = yes
-@@ -10970,7 +11747,7 @@
+@@ -10970,7 +11692,7 @@
         cf_generic_objects=
  fi
  
 -echo "$as_me:10973: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:11750: checking if GNAT supports SIGINT" >&5
++echo "$as_me:11695: 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
-@@ -11018,7 +11795,7 @@
+@@ -11018,7 +11740,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:11021: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:11798: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:11743: result: $cf_cv_gnat_sigint" >&5
  echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
  
  if test $cf_cv_gnat_sigint = yes ; then
-@@ -11027,7 +11804,7 @@
+@@ -11027,7 +11749,7 @@
         USE_GNAT_SIGINT="#"
  fi
  
 -echo "$as_me:11030: checking if GNAT pragma Unreferenced works" >&5
-+echo "$as_me:11807: checking if GNAT pragma Unreferenced works" >&5
++echo "$as_me:11752: checking if GNAT pragma Unreferenced works" >&5
  echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
  if test "${cf_cv_pragma_unreferenced+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11058,7 +11835,7 @@
+@@ -11058,7 +11780,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:11061: result: $cf_cv_pragma_unreferenced" >&5
-+echo "$as_me:11838: result: $cf_cv_pragma_unreferenced" >&5
++echo "$as_me:11783: result: $cf_cv_pragma_unreferenced" >&5
  echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
  
  # if the pragma is supported, use it (needed in the Trace code).
-@@ -11071,7 +11848,7 @@
+@@ -11071,7 +11793,7 @@
  cf_gnat_libraries=no
  cf_gnat_projects=no
  
 -echo "$as_me:11074: checking if GNAT supports project files" >&5
-+echo "$as_me:11851: checking if GNAT supports project files" >&5
++echo "$as_me:11796: checking if GNAT supports project files" >&5
  echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[0-9]*) #(vi
-@@ -11139,14 +11916,14 @@
+@@ -11139,14 +11861,14 @@
         esac
         ;;
  esac
 -echo "$as_me:11142: result: $cf_gnat_projects" >&5
-+echo "$as_me:11919: result: $cf_gnat_projects" >&5
++echo "$as_me:11864: result: $cf_gnat_projects" >&5
  echo "${ECHO_T}$cf_gnat_projects" >&6
  
@@ -8258 +9038 @@
  then
 -       echo "$as_me:11147: checking if GNAT supports libraries" >&5
-+       echo "$as_me:11924: checking if GNAT supports libraries" >&5
++       echo "$as_me:11869: checking if GNAT supports libraries" >&5
  echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 -       echo "$as_me:11149: result: $cf_gnat_libraries" >&5
-+       echo "$as_me:11926: result: $cf_gnat_libraries" >&5
++       echo "$as_me:11871: result: $cf_gnat_libraries" >&5
  echo "${ECHO_T}$cf_gnat_libraries" >&6
  fi
  
-@@ -11166,7 +11943,7 @@
+@@ -11166,7 +11888,7 @@
         USE_GNAT_LIBRARIES="#"
  fi
  
 -echo "$as_me:11169: checking for ada-compiler" >&5
-+echo "$as_me:11946: checking for ada-compiler" >&5
++echo "$as_me:11891: 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.
-@@ -11177,12 +11954,12 @@
+@@ -11177,12 +11899,12 @@
    cf_ada_compiler=gnatmake
  fi;
  
 -echo "$as_me:11180: result: $cf_ada_compiler" >&5
-+echo "$as_me:11957: result: $cf_ada_compiler" >&5
++echo "$as_me:11902: result: $cf_ada_compiler" >&5
  echo "${ECHO_T}$cf_ada_compiler" >&6
  
@@ -8285 +9065 @@
  
 -echo "$as_me:11185: checking for ada-include" >&5
-+echo "$as_me:11962: checking for ada-include" >&5
++echo "$as_me:11907: 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.
-@@ -11218,7 +11995,7 @@
+@@ -11206,7 +11928,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -11218,7 +11940,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:11221: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:11998: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:11943: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -11227,10 +12004,10 @@
+@@ -11227,10 +11949,10 @@
  fi
  ADA_INCLUDE="$withval"
  
 -echo "$as_me:11230: result: $ADA_INCLUDE" >&5
-+echo "$as_me:12007: result: $ADA_INCLUDE" >&5
++echo "$as_me:11952: result: $ADA_INCLUDE" >&5
  echo "${ECHO_T}$ADA_INCLUDE" >&6
  
 -echo "$as_me:11233: checking for ada-objects" >&5
-+echo "$as_me:12010: checking for ada-objects" >&5
++echo "$as_me:11955: 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.
-@@ -11266,7 +12043,7 @@
+@@ -11254,7 +11976,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -11266,7 +11988,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:11269: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:12046: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:11991: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -11275,10 +12052,10 @@
+@@ -11275,10 +11997,10 @@
  fi
  ADA_OBJECTS="$withval"
  
 -echo "$as_me:11278: result: $ADA_OBJECTS" >&5
-+echo "$as_me:12055: result: $ADA_OBJECTS" >&5
++echo "$as_me:12000: result: $ADA_OBJECTS" >&5
  echo "${ECHO_T}$ADA_OBJECTS" >&6
  
 -echo "$as_me:11281: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:12058: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:12003: 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.
-@@ -11288,7 +12065,7 @@
+@@ -11288,7 +12010,7 @@
  else
    with_ada_sharedlib=no
  fi;
 -echo "$as_me:11291: result: $with_ada_sharedlib" >&5
-+echo "$as_me:12068: result: $with_ada_sharedlib" >&5
++echo "$as_me:12013: result: $with_ada_sharedlib" >&5
  echo "${ECHO_T}$with_ada_sharedlib" >&6
  
  ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -11304,12 +12081,12 @@
+@@ -11304,12 +12026,12 @@
  fi
  
         else
 -               { { echo "$as_me:11307: error: No usable Ada compiler found" >&5
-+               { { echo "$as_me:12084: error: No usable Ada compiler found" >&5
++               { { echo "$as_me:12029: error: No usable Ada compiler found" >&5
  echo "$as_me: error: No usable Ada compiler found" >&2;}
     { (exit 1); exit 1; }; }
@@ -8353 +9151 @@
  else
 -       { { echo "$as_me:11312: error: The Ada compiler is needed for this package" >&5
-+       { { echo "$as_me:12089: error: The Ada compiler is needed for this package" >&5
++       { { echo "$as_me:12034: 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
-@@ -11317,7 +12094,9 @@
+@@ -11317,7 +12039,9 @@
  ################################################################################
  
@@ -8368 +9166 @@
  ### Construct the list of include-directories to be generated
  
-@@ -11354,7 +12133,7 @@
+@@ -11354,7 +12078,7 @@
  fi
  
  ### Build up pieces for makefile rules
 -echo "$as_me:11357: checking default library suffix" >&5
-+echo "$as_me:12136: checking default library suffix" >&5
++echo "$as_me:12081: checking default library suffix" >&5
  echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -11365,10 +12144,10 @@
+@@ -11365,10 +12089,10 @@
         shared)  DFT_ARG_SUFFIX=''   ;;
         esac
         test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
 -echo "$as_me:11368: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:12147: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:12092: result: $DFT_ARG_SUFFIX" >&5
  echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
  
 -echo "$as_me:11371: checking default library-dependency suffix" >&5
-+echo "$as_me:12150: checking default library-dependency suffix" >&5
++echo "$as_me:12095: checking default library-dependency suffix" >&5
  echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in #(vi
-@@ -11390,7 +12169,7 @@
+@@ -11390,11 +12114,11 @@
                 ;;
         shared) #(vi
@@ -8399 +9197 @@
                         DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                         ;;
-@@ -11421,10 +12200,10 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        DFT_LIB_SUFFIX='.dll'
+                        DFT_DEP_SUFFIX='.dll.a'
+                        ;;
+@@ -11421,10 +12145,10 @@
         esac
         test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
         test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
 -echo "$as_me:11424: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:12203: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:12148: result: $DFT_DEP_SUFFIX" >&5
  echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
  
 -echo "$as_me:11427: checking default object directory" >&5
-+echo "$as_me:12206: checking default object directory" >&5
++echo "$as_me:12151: checking default object directory" >&5
  echo $ECHO_N "checking default object directory... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -11440,7 +12219,7 @@
+@@ -11440,7 +12164,7 @@
                         DFT_OBJ_SUBDIR='obj_s' ;;
                 esac
         esac
 -echo "$as_me:11443: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:12222: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:12167: result: $DFT_OBJ_SUBDIR" >&5
  echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
  
  ### Set up low-level terminfo dependencies for makefiles.
-@@ -11656,7 +12435,7 @@
+@@ -11656,7 +12380,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ echo "$as_me:11659: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:12438: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:12383: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -11832,7 +12611,7 @@
+@@ -11788,7 +12512,7 @@
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20101002,
++configured by $0, generated by GNU Autoconf 2.52.20120811,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -11832,7 +12556,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
 -    { { echo "$as_me:11835: error: ambiguous option: $1
-+    { { echo "$as_me:12614: error: ambiguous option: $1
++    { { echo "$as_me:12559: 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;}
-@@ -11851,7 +12630,7 @@
+@@ -11851,7 +12575,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
 -  -*) { { echo "$as_me:11854: error: unrecognized option: $1
-+  -*) { { echo "$as_me:12633: error: unrecognized option: $1
++  -*) { { echo "$as_me:12578: 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;}
-@@ -11894,6 +12673,7 @@
+@@ -11870,7 +12594,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20101002, executed with
++This file was extended by $as_me 2.52.20120811, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -11892,8 +12616,8 @@
+ AWK="$AWK"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
  DFT_LWR_MODEL="$DFT_LWR_MODEL"
- ECHO_LINK="$ECHO_LINK"
+-ECHO_LINK="$ECHO_LINK"
  LIB_NAME="$LIB_NAME"
 +LIB_PREFIX="$LIB_PREFIX"
@@ -8456 +9279 @@
  LN_S="$LN_S"
  NCURSES_MAJOR="$NCURSES_MAJOR"
-@@ -11922,7 +12702,7 @@
+@@ -11922,7 +12646,7 @@
    "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:11925: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:12705: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:12649: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -12061,6 +12841,7 @@
+@@ -11981,6 +12705,7 @@
+ s,@bindir@,$bindir,;t t
+ s,@sbindir@,$sbindir,;t t
+ s,@libexecdir@,$libexecdir,;t t
++s,@datarootdir@,$datarootdir,;t t
+ s,@datadir@,$datadir,;t t
+ s,@sysconfdir@,$sysconfdir,;t t
+ s,@sharedstatedir@,$sharedstatedir,;t t
+@@ -12061,6 +12786,7 @@
  s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
  s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
@@ -8473 +9304 @@
  s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t
  s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t
-@@ -12083,6 +12864,7 @@
+@@ -12083,13 +12809,18 @@
  s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
  s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
@@ -8481 +9312 @@
  s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
  s,@NCURSES_CONST@,$NCURSES_CONST,;t t
-@@ -12109,7 +12891,8 @@
+ s,@PTHREAD@,$PTHREAD,;t t
+ s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
+ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
+-s,@ECHO_LINK@,$ECHO_LINK,;t t
++s,@ECHO_LT@,$ECHO_LT,;t t
++s,@ECHO_LD@,$ECHO_LD,;t t
++s,@RULE_CC@,$RULE_CC,;t t
++s,@SHOW_CC@,$SHOW_CC,;t t
++s,@ECHO_CC@,$ECHO_CC,;t t
+ s,@ADAFLAGS@,$ADAFLAGS,;t t
+ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
+ s,@ADA_TRACE@,$ADA_TRACE,;t t
+@@ -12109,7 +12840,8 @@
  s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t
  s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t
@@ -8491 +9334 @@
  s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t
  s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
-@@ -12237,7 +13020,7 @@
+@@ -12237,7 +12969,7 @@
    esac
  
    if test x"$ac_file" != x-; then
 -    { echo "$as_me:12240: creating $ac_file" >&5
-+    { echo "$as_me:13023: creating $ac_file" >&5
++    { echo "$as_me:12972: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -12255,7 +13038,7 @@
+@@ -12255,7 +12987,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:12258: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:13041: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:12990: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -12268,7 +13051,7 @@
+@@ -12268,7 +13000,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:12271: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:13054: error: cannot find input file: $f" >&5
++           { { echo "$as_me:13003: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -12334,7 +13117,7 @@
+@@ -12334,7 +13066,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
 -  test x"$ac_file" != x- && { echo "$as_me:12337: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:13120: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:13069: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -12345,7 +13128,7 @@
+@@ -12345,7 +13077,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:12348: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:13131: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:13080: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -12358,7 +13141,7 @@
+@@ -12358,7 +13090,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:12361: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:13144: error: cannot find input file: $f" >&5
++           { { echo "$as_me:13093: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -12416,7 +13199,7 @@
+@@ -12416,7 +13148,7 @@
    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:12419: $ac_file is unchanged" >&5
-+      { echo "$as_me:13202: $ac_file is unchanged" >&5
++      { echo "$as_me:13151: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 diff -Naur ncurses-5.9.orig/Ada95/configure.in ncurses-5.9/Ada95/configure.in
---- ncurses-5.9.orig/Ada95/configure.in 2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/configure.in      2012-02-16 18:25:13.179823762 +0000
+--- ncurses-5.9.orig/Ada95/configure.in 2012-08-25 19:57:59.379901042 +0000
++++ ncurses-5.9/Ada95/configure.in      2012-08-25 19:58:01.333225137 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -8569 +9412 @@
  dnl
 -dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 tom Exp $
-+dnl $Id: configure.in,v 1.38 2012/01/22 00:50:42 tom Exp $
++dnl $Id: configure.in,v 1.41 2012/05/05 20:54:52 tom Exp $
  dnl Process this file with autoconf to produce a configure script.
  dnl
@@ -8577 +9420 @@
  AC_PREREQ(2.13.20020210)
 -AC_REVISION($Revision: 1.30 $)
-+AC_REVISION($Revision: 1.38 $)
++AC_REVISION($Revision: 1.41 $)
  AC_INIT(gen/gen.c)
  AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
  
+@@ -54,7 +54,7 @@
+ CF_CFG_DEFAULTS
+ 
+ ###    Checks for programs.
+-AC_PROG_CC
++AC_PROG_CC(gnatgcc gcc cc)
+ CF_GCC_VERSION
+ 
+ AC_PROG_CPP
 @@ -75,28 +75,8 @@
  
@@ -8632 +9484 @@
  AC_MSG_CHECKING(if you want broken-linker support code)
  AC_ARG_ENABLE(broken_linker,
-@@ -514,7 +490,7 @@
+@@ -394,18 +370,7 @@
+ CF_HELP_MESSAGE(Testing/development Options:)
+ 
+ ###    use option --disable-echo to suppress full display compiling commands
+-AC_MSG_CHECKING(if you want to display full commands during build)
+-AC_ARG_ENABLE(echo,
+-       [  --enable-echo           build: display "compiling" commands (default)],
+-       [with_echo=$enableval],
+-       [with_echo=yes])
+-if test "$with_echo" = yes; then
+-       ECHO_LINK=
+-else
+-       ECHO_LINK='@ echo linking $@ ... ;'
+-fi
+-AC_MSG_RESULT($with_echo)
+-AC_SUBST(ECHO_LINK)
++CF_DISABLE_ECHO
+ 
+ ###    use option --enable-warnings to turn on all gcc warnings
+ AC_MSG_CHECKING(if you want to see compiler warnings)
+@@ -431,7 +396,6 @@
+ then
+        if test "$with_assertions" = no
+        then
+-               AC_DEFINE(NDEBUG)
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+                CF_ADD_ADAFLAGS(-gnata)
+@@ -514,24 +478,13 @@
  fi
  
@@ -8641 +9521 @@
  dnl At the moment we support no other Ada95 compiler.
  if test "$cf_with_ada" != "no" ; then
-@@ -556,8 +532,10 @@
+        CF_PROG_GNAT
+        if test "$cf_cv_prog_gnat_correct" = yes; then
+-
+-               # make ADAFLAGS consistent with CFLAGS
+-               case "$CFLAGS" in
+-               *-g*)
+-                       CF_ADD_ADAFLAGS(-g)
+-                       ;;
+-               esac
+-               case "$CFLAGS" in
+-               *-O*)
+-                       CF_ADD_ADAFLAGS(-O3)
+-                       ;;
+-               esac
++               CF_FIXUP_ADAFLAGS
+ 
+                CF_GNAT_GENERICS
+                CF_GNAT_SIGINT
+@@ -556,8 +509,10 @@
  ################################################################################
  
@@ -8654 +9552 @@
  ### Construct the list of include-directories to be generated
  CF_INCLUDE_DIRS
-@@ -658,6 +636,7 @@
+@@ -656,8 +611,8 @@
+ AWK="$AWK"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
  DFT_LWR_MODEL="$DFT_LWR_MODEL"
- ECHO_LINK="$ECHO_LINK"
+-ECHO_LINK="$ECHO_LINK"
  LIB_NAME="$LIB_NAME"
 +LIB_PREFIX="$LIB_PREFIX"
@@ -8662 +9562 @@
  LN_S="$LN_S"
  NCURSES_MAJOR="$NCURSES_MAJOR"
+diff -Naur ncurses-5.9.orig/Ada95/doc/Makefile.in ncurses-5.9/Ada95/doc/Makefile.in
+--- ncurses-5.9.orig/Ada95/doc/Makefile.in      2012-08-25 19:57:59.376567724 +0000
++++ ncurses-5.9/Ada95/doc/Makefile.in   2012-08-25 19:58:02.286553964 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.2 2011/03/26 19:26:17 tom Exp $
++# $Id: Makefile.in,v 1.3 2012/08/11 21:31:56 tom Exp $
+ ##############################################################################
+ # Copyright (c) 2011 Free Software Foundation, Inc.                          #
+ #                                                                            #
+@@ -38,6 +38,7 @@
+ srcdir         = @srcdir@
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ mandir         = @mandir@
+ 
 diff -Naur ncurses-5.9.orig/Ada95/gen/Makefile.in ncurses-5.9/Ada95/gen/Makefile.in
---- ncurses-5.9.orig/Ada95/gen/Makefile.in      2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/gen/Makefile.in   2012-02-16 18:25:12.907816584 +0000
+--- ncurses-5.9.orig/Ada95/gen/Makefile.in      2012-08-25 19:57:59.379901042 +0000
++++ ncurses-5.9/Ada95/gen/Makefile.in   2012-08-25 19:58:01.003226698 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
 @@ -28,7 +28,7 @@
  #
@@ -8670 +9594 @@
  #
 -#  $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $
-+#  $Id: Makefile.in,v 1.75 2011/09/24 14:41:24 nix Exp $
++#  $Id: Makefile.in,v 1.76 2012/03/17 16:45:38 tom Exp $
  #
  .SUFFIXES:
@@ -8683 +9607 @@
  RANLIB         = @RANLIB@
  
+@@ -179,7 +179,7 @@
+        -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+ 
+ $(PROG_GENERATE):  gen.o
+-       @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
++       @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
+ 
+ gen.o: $(srcdir)/gen.c
+        $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
 @@ -411,7 +411,7 @@
         @mkdir -p $(HTML_DIR)
@@ -8693 +9626 @@
            h=`basename $$f` ;\
 diff -Naur ncurses-5.9.orig/Ada95/gen/gen.c ncurses-5.9/Ada95/gen/gen.c
---- ncurses-5.9.orig/Ada95/gen/gen.c    2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/gen/gen.c 2012-02-16 18:25:12.907816584 +0000
+--- ncurses-5.9.orig/Ada95/gen/gen.c    2012-08-25 19:57:59.379901042 +0000
++++ ncurses-5.9/Ada95/gen/gen.c 2012-08-25 19:57:59.859898773 +0000
 @@ -32,7 +32,7 @@
  
@@ -8779 +9712 @@
    printf("   --               different on your system.");
  }
+diff -Naur ncurses-5.9.orig/Ada95/samples/Makefile.in ncurses-5.9/Ada95/samples/Makefile.in
+--- ncurses-5.9.orig/Ada95/samples/Makefile.in  2012-08-25 19:57:59.376567724 +0000
++++ ncurses-5.9/Ada95/samples/Makefile.in       2012-08-25 19:58:02.286553964 +0000
+@@ -28,7 +28,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.46 2011/03/28 23:45:08 tom Exp $
++#  $Id: Makefile.in,v 1.47 2012/08/11 21:31:56 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -42,6 +42,7 @@
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
+ bindir         = @bindir@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ libdir         = @libdir@
+ includedir     = @includedir@
 diff -Naur ncurses-5.9.orig/Ada95/src/Makefile.in ncurses-5.9/Ada95/src/Makefile.in
---- ncurses-5.9.orig/Ada95/src/Makefile.in      2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/src/Makefile.in   2012-02-16 18:25:12.907816584 +0000
+--- ncurses-5.9.orig/Ada95/src/Makefile.in      2012-08-25 19:57:59.383234360 +0000
++++ ncurses-5.9/Ada95/src/Makefile.in   2012-08-25 19:57:59.859898773 +0000
 @@ -28,7 +28,7 @@
  #
@@ -8856 +9809 @@
  install \
 diff -Naur ncurses-5.9.orig/INSTALL ncurses-5.9/INSTALL
---- ncurses-5.9.orig/INSTALL    2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/INSTALL 2012-02-16 18:25:13.251825661 +0000
+--- ncurses-5.9.orig/INSTALL    2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/INSTALL 2012-08-25 19:58:02.289887281 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -8870 +9823 @@
  -------------------------------------------------------------------------------
 --- $Id: INSTALL,v 1.155 2011/03/31 08:27:24 tom Exp $
-+-- $Id: INSTALL,v 1.163 2012/02/11 16:20:42 tom Exp $
++-- $Id: INSTALL,v 1.166 2012/08/11 20:12:34 tom Exp $
  ---------------------------------------------------------------------
               How to install Ncurses/Terminfo on your system
@@ -8895 +9848 @@
                 configure --with-ticlib --with-shared --disable-tic-depends
  
-@@ -616,6 +617,12 @@
+@@ -555,6 +556,9 @@
+        library by reducing global and static variables.  This option is also
+        set if --with-pthread is used.
+ 
++       Enabling this option adds a "t" to the library names, except for the
++       special case when --enable-weak-symbols is also used.
++
+     --enable-rpath
+        Use rpath option when generating shared libraries, and (with some
+        restrictions) when linking the corresponding programs.  This originally
+@@ -595,6 +599,14 @@
+        reducing the need for juggling the global SP value with set_term() and
+        delscreen().
+ 
++    --enable-string-hacks
++       Controls whether strlcat and strlcpy may be used.  The same issue
++       applies to OpenBSD's warnings about snprintf, noting that this function
++       is weakly standardized.
++
++       Aside from stifling these warnings, there is no functional improvement
++       in ncurses.
++
+     --enable-symlinks
+        If your system supports symbolic links, make tic use symbolic links
+        rather than hard links to save diskspace when writing aliases in the
+@@ -616,6 +628,12 @@
         match is found in the terminfo database.  See also the --enable-getcap
         and --enable-getcap-cache options.
@@ -8908 +9886 @@
         Turn on GCC compiler warnings.  There should be only a few.
  
-@@ -824,7 +831,17 @@
+@@ -824,7 +842,17 @@
         NOTE: a few systems build shared libraries with fixed pathnames; this
         option probably will not work for those configurations.
@@ -8927 +9905 @@
         overrides all other library model specifications.  Note that libtool
         must already be installed, uses makefile rules dependent on GNU make,
-@@ -904,6 +921,10 @@
+@@ -904,6 +932,10 @@
      --with-pkg-config=[DIR]
         Check for pkg-config, optionally specifying its path.
@@ -8938 +9916 @@
         Generate profile-libraries These are named by adding "_p" to the root,
         e.g., libncurses_p.a
-@@ -1000,6 +1021,14 @@
+@@ -996,10 +1028,27 @@
+        library dependencies for tic and other programs built with the tic
+        library.
+ 
++    --with-tparm-arg[=XXX]
++       Override the type used for tparm() arguments, which normally is a
++       "long".  However the function must assume that its arguments can hold a
++       pointer to char's which is not always workable for 64-bit platforms.  A
++       better choice would be intptr_t, which was not available at the time
++       tparm's interface was defined.
++
++       If the option is not given, this defaults to "long".
++
+     --with-trace
         Configure the trace() function as part of the all models of the ncurses
         library.  Normally it is part of the debug (libncurses_g) library only.
@@ -8953 +9944 @@
         For testing, compile with debug option.
         This also sets the --disable-leaks option.
-@@ -1024,6 +1053,8 @@
+@@ -1024,6 +1073,8 @@
         install as "ncurses.h" and modify the installed headers and manpages
         accordingly.
@@ -8962 +9953 @@
         XSI curses declares "bool" as part of the interface.  C++ also declares
         "bool".  Neither specifies the size and type of booleans, but both
-@@ -1726,20 +1757,37 @@
+@@ -1726,20 +1777,37 @@
         By default, there are no entries on the fallback list.  After you have
         built the ncurses suite for the first time, you can change the list
@@ -9005 +9996 @@
         Any non-empty fallback list is const-ed and therefore lives in sharable
 diff -Naur ncurses-5.9.orig/MANIFEST ncurses-5.9/MANIFEST
---- ncurses-5.9.orig/MANIFEST   2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/MANIFEST        2012-02-16 18:25:13.063820699 +0000
-@@ -545,6 +545,7 @@
+--- ncurses-5.9.orig/MANIFEST   2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/MANIFEST        2012-08-25 19:58:01.833222773 +0000
+@@ -545,6 +545,8 @@
  ./include/nc_alloc.h
  ./include/nc_mingw.h
  ./include/nc_panel.h
++./include/nc_string.h
 +./include/nc_termios.h
  ./include/nc_tparm.h
  ./include/ncurses_cfg.hin
  ./include/ncurses_defs
-@@ -764,7 +765,6 @@
+@@ -764,7 +766,6 @@
  ./mk-0th.awk
  ./mk-1st.awk
@@ -9023 +10015 @@
  ./ncurses/Makefile.in
  ./ncurses/README
-@@ -1022,6 +1022,7 @@
+@@ -867,6 +868,12 @@
+ ./ncurses/llib-lncursest
+ ./ncurses/llib-lncursestw
+ ./ncurses/llib-lncursesw
++./ncurses/llib-ltic
++./ncurses/llib-ltictw
++./ncurses/llib-lticw
++./ncurses/llib-ltinfo
++./ncurses/llib-ltinfotw
++./ncurses/llib-ltinfow
+ ./ncurses/modules
+ ./ncurses/tinfo/MKcaptab.awk
+ ./ncurses/tinfo/MKcaptab.sh
+@@ -970,6 +977,14 @@
+ ./ncurses/win32con/gettimeofday.c
+ ./ncurses/win32con/wcwidth.c
+ ./ncurses/win32con/win_driver.c
++./package/debian/changelog
++./package/debian/compat
++./package/debian/control
++./package/debian/copyright
++./package/debian/rules
++./package/debian/source/format
++./package/debian/watch
++./package/ncurses.spec
+ ./panel/Makefile.in
+ ./panel/headers
+ ./panel/llib-lpanel
+@@ -1022,6 +1037,7 @@
  ./test/cardfile.dat
  ./test/chgat.c
@@ -9032 +10052 @@
  ./test/configure.in
 diff -Naur ncurses-5.9.orig/Makefile.in ncurses-5.9/Makefile.in
---- ncurses-5.9.orig/Makefile.in        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/Makefile.in     2012-02-16 18:25:13.183823867 +0000
+--- ncurses-5.9.orig/Makefile.in        2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/Makefile.in     2012-08-25 19:58:02.289887281 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.33 2012/01/21 23:54:30 tom Exp $
++# $Id: Makefile.in,v 1.34 2012/08/11 21:41:19 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.                #
@@ -9053 +10073 @@
  @SET_MAKE@
  
-@@ -87,12 +88,9 @@
+@@ -48,6 +49,7 @@
+ 
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
++datarootdir    = @datarootdir@
+ 
+ bindir         = @bindir@
+ ticdir         = @TERMINFO@
+@@ -87,12 +89,9 @@
                 fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \
                 echo '** Will overwrite non-ncurses curses.h'
@@ -9068 +10096 @@
  # directories to visit.
 diff -Naur ncurses-5.9.orig/NEWS ncurses-5.9/NEWS
---- ncurses-5.9.orig/NEWS       2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/NEWS    2012-02-16 18:25:13.255825766 +0000
+--- ncurses-5.9.orig/NEWS       2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/NEWS    2012-08-25 19:58:02.303220551 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -9082 +10110 @@
  -------------------------------------------------------------------------------
 --- $Id: NEWS,v 1.1682 2011/04/04 00:02:42 tom Exp $
-+-- $Id: NEWS,v 1.1857 2012/02/11 23:39:31 tom Exp $
++-- $Id: NEWS,v 1.1942 2012/08/11 21:30:05 tom Exp $
  -------------------------------------------------------------------------------
  
  This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,467 @@
+@@ -45,6 +45,731 @@
  Changes through 1.9.9e did not credit all contributions;
  it is not possible to add this information.
  
++20120811
++       + update autoconf patch to 2.52.20120811, adding --datarootdir
++         (prompted by discussion with Erwin Waterlander).
++       + improve description of --enable-reentrant option in README and the
++         INSTALL file.
++       + add nsterm-256color, make this the default nsterm -TD
++       + remove bw from nsterm-bce, per testing with tack -TD
++
++20120804
++       + update test/configure, adding check for tinfo library.
++       + improve limit-checks for the getch fifo (report by Werner Fink).
++       + fix a remaining mismatch between $with_echo and the symbols updated
++         by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by
++         Sven Joachim, cf:  20120317).
++       + modify followup check for pkg-config's library directory in the
++         --enable-pc-files option to validate syntax (report by Sven Joachim,
++         cf: 20110716).
++
++20120728
++       + correct path for ncurses_mingw.h in include/headers, in case build
++         is done outside source-tree (patch by Roumen Petrov).
++       + modify some older xterm entries to align with xterm source -TD
++       + separate "xterm-old" alias from "xterm-r6" -TD
++       + add E3 extended capability to xterm-basic and putty -TD
++       + parenthesize parameters of other macros in curses.h -TD
++       + parenthesize parameter of COLOR_PAIR and PAIR_NUMBER in curses.h
++         in case it happens to be a comma-expression, etc.  (patch by Nick
++         Black).
++
++20120721
++       + improved form_request_by_name() and menu_request_by_name().
++       + eliminate two fixed-size buffers in toe.c
++       + extend use_tioctl() to have expected behavior when use_env(FALSE) and
++         use_tioctl(TRUE) are called.
++       + modify ncurses test-program, adding -E and -T options to demonstrate
++         use_env() versus use_tioctl().
++
++20120714
++       + add use_tioctl() function (adapted from patch by Werner Fink,
++         Novell #769788):
++
++20120707
++       + add ncurses_mingw.h to installed headers (prompted by patch by
++         Juergen Pfeifer).
++       + clarify return-codes from wgetch() in response to SIGWINCH (prompted
++         by Novell #769788).
++       + modify resizeterm() to always push a KEY_RESIZE onto the fifo, even
++         if screensize is unchanged.  Modify _nc_update_screensize() to push a
++         KEY_RESIZE if there was a SIGWINCH, even if it does not call
++         resizeterm().  These changes eliminate the case where a SIGWINCH is
++         received, but ERR returned from wgetch or wgetnstr because the screen
++         dimensions did not change (Novell #769788).
++
++20120630
++       + add --enable-interop to sample package scripts (suggested by Juergen
++         Pfeifer).
++       + update CF_PATH_SYNTAX macro, from mawk changes.
++       + modify mk-0th.awk to allow for generating llib-ltic, etc., though
++         some work is needed on cproto to work with lib_gen.c to update
++         llib-lncurses.
++       + remove redundant getenv() cal in database-iterator leftover from
++         cleanup in 20120622 changes (report by Sven Joachim).
++
++20120622
++       + add -d, -e and -q options to test/demo_terminfo and test/demo_termcap
++       + fix caching of environment variables in database-iterator (patch by
++         Philippe Troin, Redhat #831366).
++
++20120616
++       + add configure check to distinguish clang from gcc to eliminate
++         warnings about unused command-line parameters when compiler warnings
++         are enabled.
++       + improve behavior when updating terminfo entries which are hardlinked
++         by allowing for the possibility that an alias has been repurposed to
++         a new primary name.
++       + fix some strict compiler warnings based on package scripts.
++       + further fixes for configure check for working poll (Debian #676461).
++
++20120608
++       + fix an uninitialized variable in -c/-n logic for infocmp changes
++         (cf: 20120526).
++       + corrected fix for building c++ binding with clang 3.0 (report/patch
++         by Richard Yao, Gentoo #417613, cf: 20110409)
++       + correct configure check for working poll, fixing the case where stdin
++         is redirected, e.g., in rpm/dpkg builds (Debian #676461).
++       + add rpm- and dpkg-scripts, to test those build-environments.
++         The resulting packages are used only for testing.
++
++20120602
++       + add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD
++       + add kdch1, etc., to qvt108 -TD
++       + add dl1/il1 to some entries based on dl/il values -TD
++       + add dl to simpleterm -TD
++       + add consistency-checks in tic for insert-line vs delete-line
++         controls, and insert/delete-char keys
++       + correct no-leaks logic in infocmp when doing comparisons, fixing
++         duplicate free of entries given via the command-line, and freeing
++         entries loaded from the last-but-one of files specified on the
++         command-line.
++       + add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord,
++         analysis by Martin Husemann).
++       + add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by
++         Onno van der Linden).
++
++20120526
++       + extend -c and -n options of infocmp to allow comparing more than two
++         entries.
++       + correct check in infocmp for number of terminal names when more than
++         two are given.
++       + correct typo in curs_threads.3x (report by Yanhui Shen on
++         freebsd-hackers mailing list).
++
++20120512
++       + corrected 'op' for bterm (report by Samuel Thibault) -TD
++       + modify test/background.c to demonstrate a background character
++         holding a colored ACS_HLINE.  The behavior differs from SVr4 due to
++         the thick- and double-line extension (cf: 20091003).
++       + modify handling of acs characters in PutAttrChar to avoid mapping an
++         unmapped character to a space with A_ALTCHARSET set.
++       + rewrite vt520 entry based on vt420 -TD
++
++20120505
++       + remove p6 (bold) from opus3n1+ for consistency -TD
++       + remove acs stuff from env230 per clues in Ingres termcap -TD
++       + modify env230 sgr/sgr0 to match other capabilities -TD
++       + modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD
++       + make sgr for dku7202 agree with other caps -TD
++       + make sgr for ibmpc agree with other caps -TD
++       + make sgr for tek4107 agree with other caps -TD
++       + make sgr for ndr9500 agree with other caps -TD
++       + make sgr for sco-ansi agree with other caps -TD
++       + make sgr for d410 agree with other caps -TD
++       + make sgr for d210 agree with other caps -TD
++       + make sgr for d470c, d470c-7b agree with other caps -TD
++       + remove redundant AC_DEFINE for NDEBUG versus Makefile definition.
++       + fix a back-link in _nc_delink_entry(), which is needed if ncurses is
++         configured with --enable-termcap and --disable-getcap.
++
++20120428
++       + fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD
++       + add eslok flag to dec+sl -TD
++       + dec+sl applies to vt320 and up -TD
++       + drop wsl width from xterm+sl -TD
++       + reuse xterm+sl in putty and nsca-m -TD
++       + add ansi+tabs to vt520 -TD
++       + add ansi+enq to vt220-vt520 -TD
++       + fix a compiler warning in example in ncurses-intro.doc (Paul Waring).
++       + added paragraph in keyname manpage telling how extended capabilities
++         are interpreted as key definitions.
++       + modify tic's check of conflicting key definitions to include extended
++         capability strings in addition to the existing check on predefined
++         keys.
++
++20120421
++       + improve cleanup of temporary files in tic using atexit().
++       + add msgr to vt420, similar DEC vtXXX entries -TD
++       + add several missing vt420 capabilities from vt220 -TD
++       + factor out ansi+pp from several entries -TD
++       + change xterm+sl and xterm+sl-twm to include only the status-line
++         capabilities and not "use=xterm", making them more generally useful
++         as building-blocks -TD
++       + add dec+sl building block, as example -TD
++
++20120414
++       + add XT to some terminfo entries to improve usefulness for other
++         applications than screen, which would like to pretend that xterm's
++         title is a status-line.  -TD
++       + change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review
++         of ordering and overrides -TD
++       + add consistency check in tic for screen's "XT" capability.
++       + add section in terminfo.src summarizing the user-defined capabilities
++         used in that file -TD
++
++20120407
++       + fix an inconsistency between tic/infocmp "-x" option; tic omits all
++         non-standard capabilities, while infocmp was ignoring only the user
++         definable capabilities.
++       + improve special case in tic parsing of description to allow it to be
++         followed by terminfo capabilities.  Previously the description had to
++         be the last field on an input line to allow tic to distinguish
++         between termcap and terminfo format while still allowing commas to be
++         embedded in the description.
++       + correct variable name in gen_edit.sh which broke configurability of
++         the --with-xterm-kbs option.
++       + revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD
++       + further amend 20110910 change, providing for configure-script
++         override of the "linux" terminfo entry to install and changing the
++         default for that to "linux2.2" (Debian #665959).
++
++20120331
++       + update Ada95/configure to use CF_DISABLE_ECHO (cf: 20120317).
++       + correct order of use-clauses in st-256color -TD
++       + modify configure script to look for gnatgcc if the Ada95 binding
++         is built, in preference to the default gcc/cc (suggested by
++         Nicolas Boulenguez).
++       + modify configure script to ensure that the same -On option used for
++         the C compiler in CFLAGS is used for ADAFLAGS rather than simply
++         using "-O3" (suggested by Nicolas Boulenguez)
++
++20120324
++       + amend an old fix so that next_char() exits properly for empty files,
++         e.g., from reading /dev/null (cf: 20080804).
++       + modify tic so that it can read from the standard input, or from
++         a character device.  Because tic uses seek's, this requires writing
++         the data to a temporary file first (prompted by remark by Sven
++         Joachim) (cf: 20000923).
++
++20120317
++       + correct a check made in lib_napms.c, so that terminfo applications
++         can again use napms() (cf: 20110604).
++       + add a note in tic.h regarding required casts for ABSENT_BOOLEAN
++         (cf: 20040327).
++       + correct scripting for --disable-echo option in test/configure.
++       + amend check for missing c++ compiler to work when no error is
++         reported, and no variables set (cf: 20021206).
++       + add/use configure macro CF_DISABLE_ECHO.
++
++20120310
++       + fix some strict compiler warnings for abi6 and 64-bits.
++       + use begin_va_copy/end_va_copy macros in lib_printw.c (cf: 20120303).
++       + improve a limit-check in infocmp.c (Werner Fink):
++
++20120303
++       + minor tidying of terminfo.tail, clarify reason for limitation
++         regarding mapping of \0 to \200
++       + minor improvement to _nc_copy_termtype(), using memcpy to replace
++         loops.
++       + fix no-leaks checking in test/demo_termcap.c to account for multiple
++         calls to setupterm().
++       + modified the libgpm change to show previous load as a problem in the
++         debug-trace.
++       > merge some patches from OpenSUSE rpm (Werner Fink):
++       + ncurses-5.7-printw.dif, fixes for varargs handling in lib_printw.c
++       + ncurses-5.7-gpm.dif, do not dlopen libgpm if already loaded by
++         runtime linker
++       + ncurses-5.6-fallback.dif, do not free arrays and strings from static
++         fallback entries
++
++20120228
++       + fix breakage in tic/infocmp from 20120225 (report by Werner Fink).
++
++20120225
++       + modify configure script to allow creating dll's for MinGW when
++         cross-compiling.
++       + add --enable-string-hacks option to control whether strlcat and
++         strlcpy may be used.  The same issue applies to OpenBSD's warnings
++         about snprintf, noting that this function is weakly standardized.
++       + add configure checks for strlcat, strlcpy and snprintf, to help
++         reduce bogus warnings with OpenBSD builds.
++       + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration
++         (cf:20111231)
++       + update config.guess, config.sub
++
++20120218
++       + correct CF_ETIP_DEFINES configure macro, making it exit properly on
++         the first success (patch by Pierre Labastie).
++       + improve configure macro CF_MKSTEMP by moving existence-check for
++         mkstemp out of the AC_TRY_RUN, to help with cross-compiles.
++       + improve configure macro CF_FUNC_POLL from luit changes to detect
++         broken implementations, e.g., with Mac OS X.
++       + add configure option --with-tparm-arg
++       + build-fix for MinGW cross-compiling, so that make_hash does not
++         depend on TTY definition (cf: 20111008).
++
 +20120211
 +       + make sgr for xterm-pcolor agree with other caps -TD
@@ -9554 +10846 @@
  
  20110402
-@@ -155,7 +616,7 @@
+@@ -100,7 +825,7 @@
+        + modify configure script to provide value for HTML_DIR in
+          Ada95/gen/Makefile.in, which depends on whether the Ada95 binding is
+          distributed separately (report by Nicolas Boulenguez).
+-       + modify configure script to add -g and/or -O3 to ADAFLAGS if the
++       + modify configure script to add "-g" and/or "-O3" to ADAFLAGS if the
+          CFLAGS for the build has these options.
+        + amend change from 20070324, to not add 1 to the result of getmaxx
+          and getmaxy in the Ada binding (report by Nicolas Boulenguez for
+@@ -155,7 +880,7 @@
  20110212
         + regenerated html manpages.
@@ -9563 +10864 @@
  20110205
         + add xterm-utf8 entry as a demo of the U8 feature -TD
-@@ -219,7 +680,7 @@
+@@ -219,7 +944,7 @@
           version which works with termcap.
         + remove obsolete emacs "Local Variables" section from documentation
@@ -9572 +10873 @@
  
  20101128
-@@ -294,8 +755,8 @@
+@@ -294,8 +1019,8 @@
           Sven Joachim).
         + add parameterized cursor-controls to linux-basic (report by Dae) -TD
@@ -9583 +10884 @@
           Joachim).
         + add a check in mk-dlls.sh.in to obtain the size of a pointer to
-@@ -478,7 +939,7 @@
+@@ -478,7 +1203,7 @@
  20100417
         + modify _nc_capcmp() to work with cancelled strings.
@@ -9592 +10893 @@
           which adds rpath options for libraries in unusual places.
         + improve CF_RPATH_HACK_2 by checking if the rpath option for a given
-@@ -8979,15 +9440,18 @@
+@@ -6530,7 +7255,7 @@
+          handling in lynx (reported by Kim DeVaughn).
+ 
+ 990306 pre-release
+-       + add -G option to tic and infocmp, to reverse the -g option.
++       + add -G option to tic and infocmp, to reverse the "-g" option.
+        + recode functions in name_match.c to avoid use of strncpy, which
+          caused a 4-fold slowdown in tic (cf: 980530).
+        + correct a few warnings about sign-extension in recent changes.
+@@ -6901,7 +7626,7 @@
+          since that is a little more efficient.
+        + minor correction to infocmp to avoid displaying "difference" between
+          two capabilities that are rendered in equivalent forms.
+-       + add -g option to tic/infocmp to force character constants to be
++       + add "-g" option to tic/infocmp to force character constants to be
+          displayed in quoted form.  Otherwise their decimal values are shown.
+        + modify setupterm so that cancelled strings are treated the same as
+          absent strings, cancelled and absent booleans false (does not affect
+@@ -8979,15 +9704,18 @@
         + correction to #317.
         > patch 317 (ESR):
@@ -9615 +10934 @@
           (lib_getch.c, lib_twait.c).
         + new function _nc_mvcur_resume()
-@@ -9059,7 +9523,7 @@
+@@ -9059,12 +9787,12 @@
         + corrected typo in dtterm description.
         > patch 313 (ESR):
@@ -9624 +10943 @@
  960810 - snapshot
         + correct nl()/nonl() to work as per SVr4 & XSI.
-@@ -9073,7 +9537,8 @@
+        + minor fixes to ncurses.c (use 'noraw()', mvscanw return-code)
+-       + refine configure-test for -g option (Tim Mooney).
++       + refine configure-test for "-g" option (Tim Mooney).
+        + correct interaction between O_BLANK and NEW_LINE request in form
+          library (Juergen Pfeifer)
+ 
+@@ -9073,7 +9801,8 @@
         > patch 312 (ESR):
           correct terminfo.src corrupted by #310
@@ -9634 +10959 @@
  960803 - snapshot
         + corrected tparm to handle capability strings without explicit pop
-@@ -9083,7 +9548,7 @@
+@@ -9083,7 +9812,7 @@
         > patch 310 (ESR):
         + documentation and prototyping errors for has_color, immedok and idcok
@@ -9643 +10968 @@
  960730
         + eliminate quoted includes in ncurses subdirectory, ensure config.h
-@@ -9095,7 +9560,7 @@
+@@ -9095,7 +9824,7 @@
         + call cbreak() in initscr(), as per XSI & SVr4.
         + turn off hardware echo in initscr() as per XSI & SVr4
@@ -9652 +10977 @@
         + add more symbols to infocmp.
  
-@@ -9114,6 +9579,7 @@
+@@ -9114,6 +9843,7 @@
         > patch 308 (ESR):
         + terminfo changes (9.3.8)
@@ -9660 +10985 @@
  960713 - snapshot
         + always check for <sys/bsdtypes.h> since ISC needs it to declare
-@@ -9122,9 +9588,19 @@
+@@ -9122,9 +9852,19 @@
           by Juergen Pfeifer, Mike Long)
         + add LOCAL_LDFLAGS2 symbol (Juergen Pfeifer)
@@ -9681 +11006 @@
  960707
         + rollback ESR's #305 change to terminfo.src (it breaks existing
-@@ -9139,7 +9615,6 @@
+@@ -9139,7 +9879,6 @@
         + make lib_vidattr.c more readable using macros.
         + filter out rmul, rmso that conflict with sgr0 when reading terminal
@@ -9689 +11014 @@
           (reported by Zeyd).
         + modify man-page install for BSDI to install preformatted .0 files
-@@ -9152,6 +9627,12 @@
+@@ -9152,6 +9891,12 @@
         + disable scrollok during the ncurses 'p' test; if it is enabled the
           stdscr will scroll when putting the box-corners in the lower-right
@@ -9702 +11027 @@
  960629 - snapshot
         + check return code of _nc_mvcur_scrolln() in _nc_scroll_optimize() for
-@@ -9234,6 +9715,7 @@
+@@ -9234,6 +9979,7 @@
         + better fix for nvi refresh-bug (Rick Marshall)
         + fix for bug in handling of interrupted keystroke waits,
@@ -9710 +11035 @@
  960601 - snapshot
         + auto-configure man-page compression-format and renames for Debian.
-@@ -9263,6 +9745,9 @@
+@@ -9248,7 +9994,7 @@
+        + enhancement to the control over the new PC-style soft key format.
+          allow caller now to select whether or not one wants to have
+          the index-line; see curs_slk.3x for documentation (Juergen Pfeifer).
+-       + typos, don't use inline with -g (Philippe De Muyter)
++       + typos, don't use inline with "-g" (Philippe De Muyter)
+        + fixes for menus & wattr-, slk-functions (Juergen Pfeifer)
+ 
+ 960526 - snapshot
+@@ -9263,6 +10009,9 @@
         + include sys/types.h in case stdlib.h does not declare size_t.
         + fixes for makefile (Tim Mooney)
@@ -9720 +11054 @@
  960518 - snapshot
         + revised ncurses.c panner test, let pad abut all 4 sides of screen.
-@@ -9275,6 +9760,8 @@
+@@ -9275,6 +10024,8 @@
           confusion, and made this check for the /usr/lib/terminfo pre-existing
           directory.
@@ -9729 +11063 @@
         + mods to tracing, especially for ACS chars.
         + corrected off-by-one in IDCtransform.
-@@ -9294,13 +9781,21 @@
+@@ -9294,13 +10045,21 @@
         > patches 297, 298 (ESR):
         + implement TERMINFO_DIRS, and -o option of tic
@@ -9754 +11088 @@
  
  960504 - snapshot
-@@ -9326,11 +9821,20 @@
+@@ -9326,11 +10085,20 @@
         + make TIOCGWINSZ configure test less stringent, in case user
           configures via terminal that cannot get screen size.
@@ -9778 +11112 @@
  960418 - snapshot
         + use autoconf 2.9
-@@ -9338,10 +9842,22 @@
+@@ -9338,10 +10106,22 @@
           definitions via <termios.h>, modified macros in lib_raw.c to avoid
           K&R-style substitution)
@@ -9805 +11139 @@
         + fixes for NeXT, ISC and HPUX auto-configure
 diff -Naur ncurses-5.9.orig/README ncurses-5.9/README
---- ncurses-5.9.orig/README     2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/README  2012-02-16 18:25:12.915816795 +0000
+--- ncurses-5.9.orig/README     2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/README  2012-08-25 19:58:02.303220551 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
 --- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2006,2011 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.               --
  --                                                                           --
  -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -9819 +11153 @@
  -------------------------------------------------------------------------------
 --- $Id: README,v 1.23 2006/04/22 22:19:37 tom Exp $
-+-- $Id: README,v 1.24 2011/08/20 16:47:16 tom Exp $
++-- $Id: README,v 1.25 2012/08/11 20:11:26 tom Exp $
  -------------------------------------------------------------------------------
                 README file for the ncurses package
  
-@@ -153,8 +153,10 @@
+@@ -78,6 +78,10 @@
+ library interfaces are not binary-compatible with the non-wide-character
+ version.
+ 
++If you configure using the --enable-reentrant option, a "t" is appended to the
++library names (e.g., libncursest.a) and the resulting libraries have a
++different binary interface which makes the ncurses interface more "opaque".
++
+ The ncurses libraries implement the curses API.  The panel, menu and forms
+ libraries implement clones of the SVr4 panel, menu and forms APIs.  The source
+ code for these lives in the `ncurses', `panel', `menu', and `form' directories
+@@ -122,8 +126,9 @@
+        tic             -- terminfo source to binary compiler
+        infocmp         -- terminfo binary to source decompiler/comparator
+        clear           -- emits clear-screen for current terminal
++       tabs            -- set tabs on a terminal
+        tput            -- shell-script access to terminal capabilities.
+-       toe             -- table of entries utility
++       toe             -- table of entries utility
+        tset            -- terminal-initialization utility
+ 
+ The first two (tic and infocmp) are used for manipulating terminfo
+@@ -153,8 +158,10 @@
         configuration scripts, porting, mods to adhere to XSI Curses in the
         areas of background color, terminal modes.  Also memory leak testing,
@@ -9837 +11193 @@
         Beginning with release 4.2, ncurses is distributed under an MIT-style
 diff -Naur ncurses-5.9.orig/README.MinGW ncurses-5.9/README.MinGW
---- ncurses-5.9.orig/README.MinGW       2012-02-16 18:25:12.623809091 +0000
-+++ ncurses-5.9/README.MinGW    2012-02-16 18:25:13.187823972 +0000
+--- ncurses-5.9.orig/README.MinGW       2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/README.MinGW    2012-08-25 19:58:00.359896408 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -9986 +11342 @@
  
 diff -Naur ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4
---- ncurses-5.9.orig/aclocal.m4 2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/aclocal.m4      2012-02-16 18:25:13.187823972 +0000
+--- ncurses-5.9.orig/aclocal.m4 2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/aclocal.m4      2012-08-25 19:58:02.309887187 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -10000 +11356 @@
  dnl
 -dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $
-+dnl $Id: aclocal.m4,v 1.604 2012/01/22 00:30:35 tom Exp $
++dnl $Id: aclocal.m4,v 1.621 2012/08/11 23:36:44 tom Exp $
  dnl Macros used in NCURSES auto-configuration script.
  dnl
@@ -10166 +11522 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
-@@ -908,7 +975,28 @@
+@@ -908,7 +975,61 @@
  fi
  ])])dnl
@@ -10192 +11548 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
++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 not ignore some gcc options.
++dnl
++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
++dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
++dnl the wrappers for gcc and g++ warnings.
++dnl
++dnl $1 = GCC (default) or GXX
++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
++dnl $3 = CFLAGS (default) or CXXFLAGS
++AC_DEFUN([CF_CLANG_COMPILER],[
++ifelse([$2],,CLANG_COMPILER,[$2])=no
++
++if test "$ifelse([$1],,[$1],GCC)" = yes ; then
++       AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
++       cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
++       ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
++       AC_TRY_COMPILE([],[
++#ifdef __clang__
++#else
++make an error
++#endif
++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++],[])
++       ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
++       AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
++fi
++])
++dnl ---------------------------------------------------------------------------
 +dnl CF_CPP_PARAM_INIT version: 5 updated: 2011/12/03 16:54:03
  dnl -----------------
  dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
  dnl is a late feature for the standard and is not in some recent compilers
-@@ -932,7 +1020,7 @@
+@@ -932,7 +1053,7 @@
  {
         value = x;
@@ -10205 +11594 @@
         [cf_cv_cpp_param_init=yes],
         [cf_cv_cpp_param_init=no],
-@@ -999,6 +1087,54 @@
+@@ -999,7 +1120,55 @@
  test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
  ])dnl
  dnl ---------------------------------------------------------------------------
+-dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41
 +dnl CF_CXX_AR_FLAGS version: 1 updated: 2011/10/29 08:35:34
 +dnl ---------------
@@ -10257 +11647 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
- dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41
++dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39
  dnl -----------
  dnl Check if the C compiler supports "inline".
-@@ -1123,6 +1259,31 @@
+ dnl $1 is the name of a shell variable to set if inline is supported
+@@ -1012,6 +1181,9 @@
+   if test "$INTEL_COMPILER" = yes
+   then
+     :
++  elif test "$CLANG_COMPILER" = yes
++  then
++    :
+   elif test "$GCC" = yes
+   then
+     AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[
+@@ -1057,6 +1229,43 @@
+ AC_SUBST(DIRS_TO_MAKE)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
++dnl ---------------
++dnl You can always use "make -n" to see the actual options, but it's hard to
++dnl pick out/analyze warning messages when the compile-line is long.
++dnl
++dnl Sets:
++dnl    ECHO_LT - symbol to control if libtool is verbose
++dnl    ECHO_LD - symbol to prefix "cc -o" lines
++dnl    RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
++dnl    SHOW_CC - symbol to put before explicit "cc -c" lines
++dnl    ECHO_CC - symbol to put before any "cc" line
++dnl
++AC_DEFUN([CF_DISABLE_ECHO],[
++AC_MSG_CHECKING(if you want to see long compiling messages)
++CF_ARG_DISABLE(echo,
++       [  --disable-echo          display "compiling" commands],
++       [
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking [$]@;'
++    RULE_CC='@echo compiling [$]<'
++    SHOW_CC='@echo compiling [$]@'
++    ECHO_CC='@'
++],[
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++])
++AC_MSG_RESULT($enableval)
++AC_SUBST(ECHO_LT)
++AC_SUBST(ECHO_LD)
++AC_SUBST(RULE_CC)
++AC_SUBST(SHOW_CC)
++AC_SUBST(ECHO_CC)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32
+ dnl ----------------
+ dnl Combine no-leak checks with the libraries or tools that are used for the
+@@ -1123,6 +1332,30 @@
  fi
  ])
  dnl ---------------------------------------------------------------------------
-+dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
 +dnl ------------------
 +dnl This is the "--enable-pc-files" option, which is available if there is a
@@ -10273 +11718 @@
 +
 +if test "$PKG_CONFIG" != none ; then
-+       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-+               AC_ARG_ENABLE(pc-files,
-+                       [  --enable-pc-files       generate and install .pc files for pkg-config],
-+                       [enable_pc_files=$enableval],
-+                       [enable_pc_files=no])
-+               AC_MSG_RESULT($enable_pc_files)
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-+               enable_pc_files=no
-+               AC_MSG_WARN(did not find $PKG_CONFIG library)
++       AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
++       AC_ARG_ENABLE(pc-files,
++               [  --enable-pc-files       generate and install .pc files for pkg-config],
++               [enable_pc_files=$enableval],
++               [enable_pc_files=no])
++       AC_MSG_RESULT($enable_pc_files)
++       if test "$enable_pc_files" != no
++       then
++               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
 +       fi
 +else
@@ -10292 +11736 @@
  dnl ---------------
  dnl Check if the rpath option should be used, setting cache variable
-@@ -1145,7 +1306,7 @@
+@@ -1137,6 +1370,37 @@
+ AC_MSG_RESULT($cf_cv_enable_rpath)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_ENABLE_STRING_HACKS version: 1 updated: 2012/02/25 06:33:21
++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 and implying that most uses of the recommended alternatives are correct.
++dnl
++dnl Factually speaking, no one has actually counted the number of uses of these
++dnl functions versus the total of incorrect uses.  Samples of a few thousand
++dnl instances are meaningless compared to the hundreds of millions of lines of
++dnl existing C code.
++dnl
++dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some
++dnl platforms, in implementations of varying quality.  Likewise, snprintf is
++dnl standard - but evolved through phases, and older implementations are likely
++dnl to yield surprising results, as documented in manpages on various systems.
++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],
++       [with_string_hacks=$enableval],
++       [with_string_hacks=no])
++AC_MSG_RESULT($with_string_hacks)
++
++if test "x$with_string_hacks" = "xyes"; then
++       AC_DEFINE(USE_STRING_HACKS)
++       AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
++       AC_CHECK_FUNCS( strlcat strlcpy snprintf )
++fi
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
+ dnl --------
+ dnl Check if 'errno' is declared in <errno.h>
+@@ -1145,7 +1409,7 @@
  CF_CHECK_ERRNO(errno)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43
-+dnl CF_ETIP_DEFINES version: 4 updated: 2011/12/03 16:54:03
++dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07
  dnl ---------------
  dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
  dnl math.h and builtin.h, only for ncurses
-@@ -1154,11 +1315,17 @@
+@@ -1154,11 +1418,17 @@
  AC_MSG_CHECKING(for special defines needed for etip.h)
  cf_save_CXXFLAGS="$CXXFLAGS"
@@ -10320 +11802 @@
         test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
  AC_TRY_COMPILE([
-@@ -1769,6 +1936,29 @@
+@@ -1167,7 +1437,7 @@
+        test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math})
+        test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp})
+        cf_result="$cf_math $cf_excp"
+-       break
++       break 2
+ ],[])
+ done
+ done
+@@ -1305,6 +1575,25 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
++dnl -----------------
++dnl make ADAFLAGS consistent with CFLAGS
++AC_DEFUN([CF_FIXUP_ADAFLAGS],[
++       AC_MSG_CHECKING(optimization options for ADAFLAGS)
++       case "$CFLAGS" in
++       *-g*)
++               CF_ADD_ADAFLAGS(-g)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
++               CF_ADD_ADAFLAGS($cf_O_flag)
++               ;;
++       esac
++       AC_MSG_RESULT($ADAFLAGS)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_FUNC_DLSYM version: 2 updated: 2010/05/29 16:31:02
+ dnl -------------
+ dnl Test for dlsym() and related functions, as well as libdl.
+@@ -1433,14 +1722,17 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30
++dnl CF_FUNC_POLL version: 7 updated: 2012/06/09 16:22:17
+ 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],[
+ AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
+ AC_TRY_RUN([
++#include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
++#include <fcntl.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #else
+@@ -1450,11 +1742,34 @@
+        struct pollfd myfds;
+        int ret;
+ 
+-       myfds.fd = 0;
++       /* check for Darwin bug with respect to "devices" */
++       myfds.fd = open("/dev/null", 1);        /* O_WRONLY */
++       if (myfds.fd < 0)
++               myfds.fd = 0;
+        myfds.events = POLLIN;
++       myfds.revents = 0;
+ 
+        ret = poll(&myfds, 1, 100);
+-       ${cf_cv_main_return:-return}(ret != 0);
++
++       if (ret < 0 || (myfds.revents & POLLNVAL)) {
++               ret = -1;
++       } else {
++               int fd = 0;
++               if (!isatty(fd)) {
++                       fd = open("/dev/tty", 2);       /* O_RDWR */
++               }
++
++               if (fd >= 0) {
++                       /* also check with standard input */
++                       myfds.fd = fd;
++                       myfds.events = POLLIN;
++                       myfds.revents = 0;
++                       ret = poll(&myfds, 1, 100);
++               } else {
++                       ret = -1;
++               }
++       }
++       ${cf_cv_main_return:-return}(ret < 0);
+ }],
+        [cf_cv_working_poll=yes],
+        [cf_cv_working_poll=no],
+@@ -1660,7 +1975,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+ 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:
+@@ -1683,6 +1998,7 @@
+ [
+ AC_REQUIRE([CF_GCC_VERSION])
+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ 
+ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "${as_me:-configure}"
+@@ -1758,6 +2074,13 @@
+                                        continue;;
+                                esac
+                                ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [[12]].*)
++                                       CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
++                                       continue;;
++                               esac
++                               ;;
+                        esac
+                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+                fi
+@@ -1769,6 +2092,29 @@
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
@@ -10350 +11954 @@
  dnl ----------------
  AC_DEFUN([CF_GNAT_GENERICS],
-@@ -2040,7 +2230,7 @@
+@@ -2040,7 +2386,7 @@
  rm -rf conftest* *~conftest*
  ])dnl
@@ -10359 +11963 @@
  dnl Verify version of GNAT.
  AC_DEFUN([CF_GNAT_VERSION],
-@@ -2052,7 +2242,7 @@
+@@ -2052,7 +2398,7 @@
  AC_MSG_RESULT($cf_gnat_version)
  
@@ -10368 +11972 @@
         ;;
  *)
-@@ -2581,7 +2771,7 @@
+@@ -2136,21 +2482,21 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GXX_VERSION version: 6 updated: 2010/10/23 15:44:18
++dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39
+ dnl --------------
+ dnl Check for version of g++
+ AC_DEFUN([CF_GXX_VERSION],[
+ AC_REQUIRE([AC_PROG_CPP])
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-       AC_MSG_CHECKING(version of g++)
++       AC_MSG_CHECKING(version of ${CXX:-g++})
+        GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+        test -z "$GXX_VERSION" && GXX_VERSION=unknown
+        AC_MSG_RESULT($GXX_VERSION)
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GXX_WARNINGS version: 6 updated: 2010/08/14 18:25:37
++dnl CF_GXX_WARNINGS version: 7 updated: 2012/06/16 14:55:39
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.
+ dnl
+@@ -2173,6 +2519,7 @@
+ [
+ 
+ CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS)
++CF_CLANG_COMPILER(GXX,CLANG_CPLUSPLUS,CXXFLAGS)
+ 
+ AC_REQUIRE([CF_GXX_VERSION])
+ 
+@@ -2581,7 +2928,7 @@
  ])
  ])
@@ -10377 +12014 @@
  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
-@@ -2602,7 +2792,7 @@
+@@ -2602,7 +2949,7 @@
      esac
  else
@@ -10386 +12023 @@
                 LDFLAGS_SHARED=-bdynamic
                 ;;
-@@ -2652,7 +2842,17 @@
+@@ -2652,7 +2999,17 @@
  int cf_ldflags_static(FILE *fp);
  ],[
@@ -10405 +12042 @@
         rm -f libconftest.*
         LIBS="$cf_save_LIBS"
-@@ -2673,7 +2873,7 @@
+@@ -2673,7 +3030,7 @@
  AC_SUBST(LDFLAGS_SHARED)
  ])
@@ -10414 +12051 @@
  dnl For the given system and compiler, find the compiler flags to pass to the
  dnl loader to use the "rpath" feature.
-@@ -2694,10 +2894,10 @@
+@@ -2694,10 +3051,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -10427 +12064 @@
         ;;
  netbsd*) #(vi
-@@ -2756,11 +2956,11 @@
+@@ -2756,11 +3113,11 @@
  $1="$cf_library_path_list [$]$1"
  ])dnl
@@ -10441 +12078 @@
         case $cf_cv_system_name in #(vi
         OS/2*|os2*) #(vi
-@@ -2773,7 +2973,7 @@
+@@ -2773,7 +3130,7 @@
         AC_SUBST(LIB_PREFIX)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30
-+dnl CF_LIB_RULES version: 63 updated: 2012/01/21 19:28:10
++dnl CF_LIB_RULES version: 65 updated: 2012/06/30 17:25:25
  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
-@@ -2788,7 +2988,7 @@
+@@ -2788,13 +3145,15 @@
  dnl    lib<name>.so.<maj>.<minor>
  AC_DEFUN([CF_LIB_RULES],
@@ -10458 +12095 @@
  AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
  
- if test $cf_cv_shlib_version = cygdll ; then
-@@ -3010,6 +3210,7 @@
+-if test $cf_cv_shlib_version = cygdll ; then
++case $cf_cv_shlib_version in #(vi
++cygdll|mingw)
+        TINFO_NAME=$TINFO_ARG_SUFFIX
+        TINFO_SUFFIX=.dll
+-fi
++       ;;
++esac
+ 
+ if test -n "$TINFO_SUFFIX" ; then
+        case $TINFO_SUFFIX in
+@@ -2880,11 +3239,18 @@
+                        # 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.
+-                       if test $cf_cv_shlib_version = cygdll ; then
++                       case $cf_cv_shlib_version in #(vi
++                       cygdll) #(vi
+                                cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                                LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"
+                                continue
+-                       fi
++                               ;;
++                       mingw)
++                               cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
++                               LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}"
++                               continue
++                               ;;
++                       esac
+                        fi
+                        LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
+                done
+@@ -2928,7 +3294,7 @@
+                mv $cf_dir/Makefile.out $cf_dir/Makefile
+ 
+                $AWK -f $srcdir/mk-0th.awk \
+-                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \
++                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
+                        $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+ 
+                for cf_subset in $cf_subsets
+@@ -3010,6 +3376,7 @@
                                 prefix=$cf_prefix \
                                 suffix=$cf_suffix \
@@ -10467 +12144 @@
                                 TermlibRoot=$TINFO_NAME \
                                 TermlibSuffix=$TINFO_SUFFIX \
-@@ -3292,7 +3493,7 @@
+@@ -3292,7 +3659,7 @@
  ])
  ])
  dnl ---------------------------------------------------------------------------
 -dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04
++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07
  dnl -------------
  dnl Compute the library file-suffix from the given model name
  dnl $1 = model name
-@@ -3321,7 +3522,7 @@
+@@ -3321,11 +3688,11 @@
                 ;;
         shared) #(vi
@@ -10485 +12162 @@
                         $3=[$]$2
                         ;;
-@@ -3799,7 +4000,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        $2='.dll'
+                        $3='.dll.a'
+                        ;;
+@@ -3799,7 +4166,7 @@
  AC_MSG_RESULT($MANPAGE_TBL)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_MAN_PAGES version: 39 updated: 2010/10/23 15:44:18
-+dnl CF_MAN_PAGES version: 40 updated: 2011/09/10 16:20:21
++dnl CF_MAN_PAGES version: 41 updated: 2012/08/11 19:35:44
  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
-@@ -3949,7 +4150,9 @@
+@@ -3856,6 +4223,7 @@
+ # this script is generated by the configure-script CF_MAN_PAGES macro.
+ 
+ prefix="$cf_prefix"
++datarootdir="$datarootdir"
+ datadir="$datadir"
+ 
+ NCURSES_MAJOR="$NCURSES_MAJOR"
+@@ -3949,7 +4317,9 @@
  
  if test "$MANPAGE_ALIASES" != no ; then
@@ -10505 +12195 @@
  fi
  
-@@ -3995,6 +4198,13 @@
+@@ -3995,6 +4365,13 @@
  fi
  CF_EOF
@@ -10519 +12209 @@
  cat >>$cf_edit_man <<CF_EOF
         sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-@@ -4376,7 +4586,7 @@
+@@ -4184,7 +4561,7 @@
+ test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
+ 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).
+@@ -4226,9 +4603,11 @@
+ }
+ ],[cf_cv_func_mkstemp=yes
+ ],[cf_cv_func_mkstemp=no
+-],[AC_CHECK_FUNC(mkstemp)
+-])
++],[cf_cv_func_mkstemp=maybe])
+ ])
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       AC_CHECK_FUNC(mkstemp)
++fi
+ if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
+        AC_DEFINE(HAVE_MKSTEMP)
+ fi
+@@ -4339,7 +4718,7 @@
+        AC_SUBST(PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
+ 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
+@@ -4359,7 +4738,7 @@
+   ;;
+ .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
+   ;;
+-.\[$]{*prefix}*) #(vi
++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
+   eval $1="[$]$1"
+   case ".[$]$1" in #(vi
+   .NONE/*)
+@@ -4376,7 +4755,7 @@
  esac
  ])dnl
@@ -10528 +12259 @@
  dnl Check for the package-config program, unless disabled by command-line.
  AC_DEFUN([CF_PKG_CONFIG],
-@@ -4393,7 +4603,9 @@
+@@ -4393,7 +4772,9 @@
         PKG_CONFIG=none
         ;;
@@ -10539 +12270 @@
  *)
         PKG_CONFIG=$withval
-@@ -4658,7 +4870,7 @@
+@@ -4658,7 +5039,7 @@
  test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
  ])dnl
@@ -10548 +12279 @@
  dnl Check for gnatmake, ensure that it is complete.
  AC_DEFUN([CF_PROG_GNAT],[
-@@ -4666,6 +4878,7 @@
+@@ -4666,6 +5047,7 @@
  AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
  if test "$ac_cv_prog_gnat_exists" = no; then
@@ -10556 +12287 @@
     CF_GNAT_VERSION
     AC_CHECK_PROG(M4_exists, m4, yes, no)
-@@ -4709,7 +4922,7 @@
+@@ -4709,7 +5091,7 @@
  esac
  ])dnl
@@ -10565 +12296 @@
  dnl Check for ldconfig, needed to fixup shared libraries that would be built
  dnl and then used in the install.
-@@ -4718,7 +4931,7 @@
+@@ -4718,7 +5100,7 @@
    LDCONFIG=:
  else
@@ -10574 +12305 @@
    ;;
  *) LDPATH=$PATH:/sbin:/usr/sbin
-@@ -4759,7 +4972,7 @@
+@@ -4759,7 +5141,7 @@
  test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
  ])dnl
@@ -10583 +12314 @@
  dnl Attempt to determine if we've got one of the flavors of regular-expression
  dnl code that we can support.
-@@ -4771,7 +4984,7 @@
+@@ -4771,7 +5153,7 @@
  cf_regex_libs="regex re"
  case $host_os in #(vi
@@ -10592 +12323 @@
  esac
  
-@@ -4984,7 +5197,7 @@
+@@ -4984,7 +5366,7 @@
  AC_SUBST(EXTRA_LDFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
-+dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39
++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
  dnl --------------
  dnl --------------
  dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -5059,10 +5272,14 @@
+@@ -5059,10 +5441,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -10618 +12349 @@
                 ;;
         beos*) #(vi
-@@ -5115,9 +5332,19 @@
+@@ -5115,9 +5501,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -10639 +12370 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -5134,18 +5361,18 @@
+@@ -5134,18 +5530,39 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -10650 +12381 @@
                 ;;
 -       openbsd[[2-9]].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\[$]1
++               IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \[$]SHARED_LIB
++               ** IMPORT_LIB \[$]IMPORT_LIB
++EOF
++               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[[2-9]].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -10661 +12413 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                 CF_SHARED_SONAME
-@@ -5156,12 +5383,12 @@
+@@ -5156,12 +5573,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -10677 +12429 @@
                 CF_SHARED_SONAME
                 MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
-@@ -5171,7 +5398,7 @@
+@@ -5171,7 +5588,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -10686 +12438 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -5276,9 +5503,9 @@
+@@ -5276,9 +5693,12 @@
                 ;;
         esac
@@ -10696 +12448 @@
 +       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}"
++
++       CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
++       CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
  
         AC_SUBST(CC_SHARED_OPTS)
         AC_SUBST(LD_RPATH_OPT)
-@@ -5290,6 +5517,7 @@
+@@ -5290,6 +5710,7 @@
         AC_SUBST(LOCAL_LDFLAGS)
         AC_SUBST(LOCAL_LDFLAGS2)
@@ -10707 +12462 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
-@@ -5474,7 +5702,7 @@
+@@ -5474,7 +5895,7 @@
  fi
  ])dnl
@@ -10716 +12471 @@
  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
-@@ -5497,6 +5725,7 @@
+@@ -5497,6 +5918,7 @@
         TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
  fi
@@ -10724 +12479 @@
  for cf_dir in $1
  do
-@@ -5535,6 +5764,7 @@
+@@ -5535,6 +5957,7 @@
                                 TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
                                 TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2"
@@ -10732 +12487 @@
         fi
  done
-@@ -5562,10 +5792,18 @@
+@@ -5562,10 +5985,18 @@
         SRC_SUBDIRS="$SRC_SUBDIRS test"
  fi
@@ -10753 +12508 @@
         ADA_SUBDIRS="gen src"
         if test "x$cf_with_tests" != "xno" ; then
-@@ -5624,13 +5862,13 @@
+@@ -5624,13 +6055,13 @@
  AC_DEFUN([CF_STRIP_G_OPT],
  [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
@@ -10770 +12525 @@
  AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE)
  AC_TRY_COMPILE([
-@@ -5645,22 +5883,24 @@
+@@ -5645,22 +6076,24 @@
  #include <signal.h>],
         [struct sigaction act],
@@ -10798 +12553 @@
         AC_CHECK_HEADERS( sys/termio.h )
  fi
-@@ -5680,7 +5920,7 @@
+@@ -5680,7 +6113,7 @@
  #include <termios.h>],
                         [struct termios foo; int x = foo.c_iflag],
@@ -10807 +12562 @@
         AC_MSG_RESULT($termios_bad)
         fi
-@@ -5798,6 +6038,45 @@
+@@ -5798,6 +6231,45 @@
  AC_SUBST(top_builddir)
  ])dnl
@@ -10853 +12608 @@
  dnl ----------------
  dnl Determine the type we should use for chtype (and attr_t, which is treated
-@@ -6182,7 +6461,7 @@
+@@ -6182,7 +6654,7 @@
  fi
  ])
@@ -10862 +12617 @@
  dnl Provide a configure option to incorporate libtool.  Define several useful
  dnl symbols for the makefile rules.
-@@ -6258,7 +6537,7 @@
+@@ -6258,7 +6730,7 @@
                 AC_MSG_ERROR(Cannot find libtool)
         fi
@@ -10871 +12626 @@
         LIB_SUFFIX=.la
         LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -6283,7 +6562,7 @@
+@@ -6283,7 +6755,7 @@
         # special hack to add -no-undefined (which libtool should do for itself)
         LT_UNDEF=
@@ -10880 +12635 @@
                 ;;
         esac
-@@ -6323,6 +6602,32 @@
+@@ -6323,6 +6795,32 @@
  
  ])dnl
@@ -10913 +12668 @@
  dnl ------------
  dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-@@ -6386,7 +6691,50 @@
+@@ -6386,7 +6884,50 @@
  
  ])dnl
@@ -10965 +12720 @@
  dnl Check for POSIX thread library.
  AC_DEFUN([CF_WITH_PTHREAD],
-@@ -6402,23 +6750,28 @@
+@@ -6402,23 +6943,28 @@
      AC_CHECK_HEADER(pthread.h,[
          AC_DEFINE(HAVE_PTHREADS_H)
@@ -11007 +12762 @@
  fi
  ])
-@@ -6486,7 +6839,7 @@
+@@ -6486,7 +7032,7 @@
         [USE_VALGRIND])
  ])dnl
@@ -11016 +12771 @@
  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,
-@@ -6502,7 +6855,7 @@
+@@ -6502,7 +7048,7 @@
  cf_xopen_source=
  
@@ -11025 +12780 @@
         ;;
  cygwin) #(vi
-@@ -6513,6 +6866,7 @@
+@@ -6513,6 +7059,7 @@
         ;;
  darwin*) #(vi
@@ -11033 +12788 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -6530,15 +6884,23 @@
+@@ -6530,15 +7077,23 @@
         ;;
  irix[[56]].*) #(vi
@@ -11059 +12814 @@
  openbsd*) #(vi
         # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -6552,36 +6914,11 @@
+@@ -6552,36 +7107,11 @@
  sco*) #(vi
         # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
@@ -11098 +12853 @@
         ;;
  esac
-@@ -6589,4 +6926,33 @@
+@@ -6589,4 +7119,33 @@
  if test -n "$cf_xopen_source" ; then
         CF_ADD_CFLAGS($cf_xopen_source)
@@ -11133 +12888 @@
  ])
 diff -Naur ncurses-5.9.orig/announce.html.in ncurses-5.9/announce.html.in
---- ncurses-5.9.orig/announce.html.in   2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/announce.html.in        2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/announce.html.in   2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/announce.html.in        2012-08-25 19:57:59.893231947 +0000
 @@ -1,6 +1,6 @@
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -11220 +12975 @@
    <ul>
 diff -Naur ncurses-5.9.orig/c++/Makefile.in ncurses-5.9/c++/Makefile.in
---- ncurses-5.9.orig/c++/Makefile.in    2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/Makefile.in 2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/Makefile.in    2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/Makefile.in 2012-08-25 19:58:01.013226651 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.93 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.95 2011/07/30 22:52:07 tom Exp $
++# $Id: Makefile.in,v 1.96 2012/03/17 16:45:38 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
  #                                                                            #
  # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -11248 +13003 @@
  OBJS_DEMO = $(MODEL)/demo$o
  
+@@ -179,7 +180,7 @@
+ demo$x:        $(OBJS_DEMO) \
+        $(MY_LIBRARY)  \
+        @TEST_DEPS@
+-       @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
++       @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+ 
+ etip.h:        $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
+        cp $(srcdir)/etip.h.in $@
 diff -Naur ncurses-5.9.orig/c++/cursesapp.h ncurses-5.9/c++/cursesapp.h
---- ncurses-5.9.orig/c++/cursesapp.h    2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesapp.h 2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesapp.h    2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesapp.h 2012-08-25 19:57:59.893231947 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
@@ -11331 +13095 @@
  };
 diff -Naur ncurses-5.9.orig/c++/cursesf.cc ncurses-5.9/c++/cursesf.cc
---- ncurses-5.9.orig/c++/cursesf.cc     2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/cursesf.cc  2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesf.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursesf.cc  2012-08-25 19:57:59.896565265 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11409 +13173 @@
    UserDefinedFieldType_With_Choice* udf =
 diff -Naur ncurses-5.9.orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h
---- ncurses-5.9.orig/c++/cursesf.h      2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesf.h   2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesf.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesf.h   2012-08-25 19:58:01.569890686 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
  /****************************************************************************
 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -11424 +13188 @@
  
 -// $Id: cursesf.h,v 1.28 2005/08/13 18:08:24 tom Exp $
-+// $Id: cursesf.h,v 1.29 2011/04/09 18:07:01 Alexander.Kolesen Exp $
++// $Id: cursesf.h,v 1.30 2012/06/08 17:43:56 Richard.Yao Exp $
  
  #ifndef NCURSES_CURSESF_H_incl
  #define NCURSES_CURSESF_H_incl 1
-@@ -681,7 +681,7 @@
+@@ -677,7 +677,7 @@
+   }
+ 
+ public:
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
                    const T* p_UserData = STATIC_CAST(T*)(0),
                    bool with_frame=FALSE,
                    bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
-+    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
-       if (form)
+@@ -686,7 +686,7 @@
         set_user (const_cast<void *>(p_UserData));
    };
-@@ -694,7 +694,7 @@
-                   const T* p_UserData = STATIC_CAST(T*)(0),
-                   bool with_frame=FALSE,
-                   bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
-+    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
-                   with_frame, autoDelete_Fields) {
-       if (form)
-        set_user (const_cast<void *>(p_UserData));
+ 
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
+                   int nlines,
+                   int ncols,
+                   int begin_y = 0,
 diff -Naur ncurses-5.9.orig/c++/cursesm.cc ncurses-5.9/c++/cursesm.cc
---- ncurses-5.9.orig/c++/cursesm.cc     2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesm.cc  2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesm.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursesm.cc  2012-08-25 19:57:59.899898583 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11507 +13271 @@
  }
 diff -Naur ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
---- ncurses-5.9.orig/c++/cursesm.h      2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/cursesm.h   2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursesm.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesm.h   2012-08-25 19:58:01.569890686 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
  /****************************************************************************
 - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -11522 +13286 @@
  
 -// $Id: cursesm.h,v 1.25 2005/08/13 18:10:36 tom Exp $
-+// $Id: cursesm.h,v 1.27 2011/09/17 21:37:01 tom Exp $
++// $Id: cursesm.h,v 1.28 2012/06/08 17:43:56 Richard.Yao Exp $
  
  #ifndef NCURSES_CURSESM_H_incl
@@ -11534 +13298 @@
  
    virtual ~NCursesMenuItem ();
-@@ -639,7 +640,7 @@
+@@ -635,7 +636,7 @@
+   }
+ 
+ public:
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
                    const T* p_UserData = STATIC_CAST(T*)(0),
                    bool with_frame=FALSE,
                    bool autoDelete_Items=FALSE)
--    : NCursesMenu (Items, with_frame, autoDelete_Items) {
-+    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
-       if (menu)
+@@ -644,7 +645,7 @@
         set_user (const_cast<void *>(p_UserData));
    };
-@@ -651,7 +652,7 @@
-                   int begin_x = 0,
-                   const T* p_UserData = STATIC_CAST(T*)(0),
-                   bool with_frame=FALSE)
--    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
-+    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
-       if (menu)
-        set_user (const_cast<void *>(p_UserData));
-   };
+ 
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
+                   int nlines,
+                   int ncols,
+                   int begin_y = 0,
 diff -Naur ncurses-5.9.orig/c++/cursespad.cc ncurses-5.9/c++/cursespad.cc
---- ncurses-5.9.orig/c++/cursespad.cc   2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursespad.cc        2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursespad.cc   2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursespad.cc        2012-08-25 19:57:59.899898583 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11581 +13345 @@
  
 diff -Naur ncurses-5.9.orig/c++/cursesw.cc ncurses-5.9/c++/cursesw.cc
---- ncurses-5.9.orig/c++/cursesw.cc     2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/cursesw.cc  2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursesw.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursesw.cc  2012-08-25 19:57:59.903231901 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11616 +13380 @@
      RIPOFFINIT init = *prip++;
 diff -Naur ncurses-5.9.orig/c++/cursesw.h ncurses-5.9/c++/cursesw.h
---- ncurses-5.9.orig/c++/cursesw.h      2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesw.h   2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursesw.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesw.h   2012-08-25 19:57:59.903231901 +0000
 @@ -1,7 +1,7 @@
  // * This makes emacs happy -*-Mode: C++;-*-
@@ -11672 +13436 @@
    }
    // Disable this call; the viewport subwindow is already defined
+diff -Naur ncurses-5.9.orig/c++/cursslk.cc ncurses-5.9/c++/cursslk.cc
+--- ncurses-5.9.orig/c++/cursslk.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursslk.cc  2012-08-25 19:58:00.879893949 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -35,14 +35,15 @@
+ #include "cursslk.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursslk.cc,v 1.15 2005/08/06 22:12:36 tom Exp $")
++MODULE_ID("$Id: cursslk.cc,v 1.16 2012/02/23 10:41:56 tom Exp $")
+ 
+ Soft_Label_Key_Set::Soft_Label_Key&
+   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
+ {
+   delete[] label;
+-  label = new char[1 + ::strlen(text)];
+-  (::strcpy)(label,text);
++  size_t need = 1 + ::strlen(text);
++  label = new char[need];
++  ::_nc_STRCPY(label,text,need);
+   return *this;
+ }
+ 
 diff -Naur ncurses-5.9.orig/c++/demo.cc ncurses-5.9/c++/demo.cc
---- ncurses-5.9.orig/c++/demo.cc        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/demo.cc     2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/demo.cc        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/demo.cc     2012-08-25 19:58:00.879893949 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
  /****************************************************************************
 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -11688 +13482 @@
   *
 - * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $
-+ * $Id: demo.cc,v 1.40 2011/09/17 22:12:10 tom Exp $
++ * $Id: demo.cc,v 1.41 2012/02/23 10:41:56 tom Exp $
   */
  
@@ -11700 +13494 @@
    }
    bool char_check(int c) {
+@@ -319,7 +320,7 @@
+     for(int i=1; i <= S->labels(); i++) {
+       char buf[8];
+       assert(i < 100);
+-      ::sprintf(buf, "Frm%02d", i);
++      ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Frm%02d", i);
+       (*S)[i] = buf;                                      // Text
+       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
+     }
+@@ -539,7 +540,7 @@
+   for(int i=1; i <= S.labels(); i++) {
+     char buf[8];
+     assert(i < 100);
+-    ::sprintf(buf, "Key%02d", i);
++    ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Key%02d", i);
+     S[i] = buf;                                      // Text
+     S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
+   }
 diff -Naur ncurses-5.9.orig/c++/etip.h.in ncurses-5.9/c++/etip.h.in
---- ncurses-5.9.orig/c++/etip.h.in      2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/etip.h.in   2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/etip.h.in      2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/etip.h.in   2012-08-25 19:57:59.906565219 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
@@ -11774 +13586 @@
  
    NCursesFormException (const NCursesForm* form,
+diff -Naur ncurses-5.9.orig/c++/internal.h ncurses-5.9/c++/internal.h
+--- ncurses-5.9.orig/c++/internal.h     2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/internal.h  2012-08-25 19:58:00.879893949 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -31,7 +31,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: internal.h,v 1.17 2008/12/07 02:07:34 juergen Exp $
++// $Id: internal.h,v 1.18 2012/02/23 10:41:56 tom Exp $
+ 
+ #ifndef NCURSES_CPLUS_INTERNAL_H
+ #define NCURSES_CPLUS_INTERNAL_H 1
+@@ -62,4 +62,6 @@
+ #define NULL 0
+ #endif
+ 
++#include <nc_string.h>
++
+ #endif /* NCURSES_CPLUS_INTERNAL_H */
 diff -Naur ncurses-5.9.orig/config.guess ncurses-5.9/config.guess
---- ncurses-5.9.orig/config.guess       2012-02-16 18:25:12.607808668 +0000
-+++ ncurses-5.9/config.guess    2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/config.guess       2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/config.guess    2012-08-25 19:58:00.879893949 +0000
 @@ -1,10 +1,10 @@
  #! /bin/sh
@@ -11784 +13623 @@
 -#   Free Software Foundation, Inc.
 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2911 Free Software Foundation, Inc.
++#   2011, 2012 Free Software Foundation, Inc.
  
 -timestamp='2010-09-24'
-+timestamp='2011-01-01'
++timestamp='2012-02-10'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -57,8 +57,8 @@
+@@ -17,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -57,8 +55,8 @@
  
  Originally written by Per Bothner.
@@ -11797 +13647 @@
 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 -Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 +Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -92,7 +92,7 @@
+@@ -92,7 +90,7 @@
    exit 1
  fi
@@ -11811 +13661 @@
  # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
  # compiler to aid in system detection is discouraged as it requires
-@@ -106,7 +106,7 @@
+@@ -106,7 +104,7 @@
  
  set_cc_for_build='
@@ -11820 +13670 @@
   { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-@@ -270,7 +270,10 @@
+@@ -145,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+        # NetBSD (nbsd) targets should (where applicable) match one or
+-       # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++       # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+        # switched to ELF, *-*-netbsd* would select the old
+        # object file format.  This provides both forward
+@@ -220,10 +218,10 @@
+        exit ;;
+     alpha:OSF1:*:*)
+        case $UNAME_RELEASE in
+-           *4.0)
++       *4.0)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+                ;;
+-           *5.*)
++       *5.*)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                ;;
+        esac
+@@ -270,7 +268,10 @@
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
@@ -11832 +13704 @@
         # How do we know it's Interix rather than the generic POSIX subsystem?
         # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -326,8 +329,8 @@
+@@ -326,8 +327,8 @@
             sparc) echo sparc-icl-nx7; exit ;;
         esac ;;
@@ -11843 +13715 @@
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit ;;
-@@ -495,7 +498,7 @@
+@@ -495,7 +496,7 @@
         else
             echo i586-dg-dgux${UNAME_RELEASE}
@@ -11852 +13724 @@
         echo m88k-dolphin-sysv3
         exit ;;
+@@ -597,50 +598,50 @@
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                     532)                      # CPU_PA_RISC2_0
++                       case "${sc_kernel_bits}" in
++                         32) HP_ARCH="hppa2.0n" ;;
++                         64) HP_ARCH="hppa2.0w" ;;
+                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++                       esac ;;
++                   esac
+                fi
+                if [ "${HP_ARCH}" = "" ]; then
+                    eval $set_cc_for_build
+-                   sed 's/^              //' << EOF >$dummy.c
++                   sed 's/^            //' << EOF >$dummy.c
++
++               #define _HPUX_SOURCE
++               #include <stdlib.h>
++               #include <unistd.h>
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-               {
+-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-               case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-                   switch (bits)
+-                       {
+-                       case 64: puts ("hppa2.0w"); break;
+-                       case 32: puts ("hppa2.0n"); break;
+-                       default: puts ("hppa2.0"); break;
+-                       } break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-                   puts ("hppa2.0"); break;
+-              #endif
+-               default: puts ("hppa1.0"); break;
+-               }
+-                  exit (0);
+-              }
++               int main ()
++               {
++               #if defined(_SC_KERNEL_BITS)
++                   long bits = sysconf(_SC_KERNEL_BITS);
++               #endif
++                   long cpu  = sysconf (_SC_CPU_VERSION);
++
++                   switch (cpu)
++                       {
++                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++                       case CPU_PA_RISC2_0:
++               #if defined(_SC_KERNEL_BITS)
++                           switch (bits)
++                               {
++                               case 64: puts ("hppa2.0w"); break;
++                               case 32: puts ("hppa2.0n"); break;
++                               default: puts ("hppa2.0"); break;
++                               } break;
++               #else  /* !defined(_SC_KERNEL_BITS) */
++                           puts ("hppa2.0"); break;
++               #endif
++                       default: puts ("hppa1.0"); break;
++                       }
++                   exit (0);
++               }
+ EOF
+                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -789,13 +790,12 @@
+        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        exit ;;
+     *:FreeBSD:*:*)
+-       case ${UNAME_MACHINE} in
+-           pc98)
+-               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++       UNAME_PROCESSOR=`/usr/bin/uname -p`
++       case ${UNAME_PROCESSOR} in
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+-               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++               echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
+        exit ;;
+     i*:CYGWIN*:*)
+@@ -804,6 +804,9 @@
+     *:MINGW*:*)
+        echo ${UNAME_MACHINE}-pc-mingw32
+        exit ;;
++    i*:MSYS*:*)
++       echo ${UNAME_MACHINE}-pc-msys
++       exit ;;
+     i*:windows32*:*)
+        # uname -m includes "-pc" on this system.
+        echo ${UNAME_MACHINE}-mingw32
 @@ -820,8 +823,8 @@
                 echo x86_64-unknown-interix${UNAME_RELEASE}
@@ -11863 +13852 @@
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
         echo i${UNAME_MACHINE}-pc-mks
-@@ -934,14 +937,14 @@
+@@ -858,15 +861,22 @@
+     i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit ;;
++    aarch64:Linux:*:*)
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
++       exit ;;
++    aarch64_be:Linux:*:*)
++       UNAME_MACHINE=aarch64_be
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
++       exit ;;
+     alpha:Linux:*:*)
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-           EV5)   UNAME_MACHINE=alphaev5 ;;
+-           EV56)  UNAME_MACHINE=alphaev56 ;;
+-           PCA56) UNAME_MACHINE=alphapca56 ;;
+-           PCA57) UNAME_MACHINE=alphapca56 ;;
+-           EV6)   UNAME_MACHINE=alphaev6 ;;
+-           EV67)  UNAME_MACHINE=alphaev67 ;;
+-           EV68*) UNAME_MACHINE=alphaev68 ;;
++         EV5)   UNAME_MACHINE=alphaev5 ;;
++         EV56)  UNAME_MACHINE=alphaev56 ;;
++         PCA56) UNAME_MACHINE=alphapca56 ;;
++         PCA57) UNAME_MACHINE=alphapca56 ;;
++         EV6)   UNAME_MACHINE=alphaev6 ;;
++         EV67)  UNAME_MACHINE=alphaev67 ;;
++         EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+        objdump --private-headers /bin/sh | grep -q ld.so.1
+        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+@@ -874,30 +884,39 @@
+        exit ;;
+     arm*:Linux:*:*)
+        eval $set_cc_for_build
+-       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \
+-           grep -q __ARM_EABI__
++       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++           | grep -q __ARM_EABI__
+        then
+            echo ${UNAME_MACHINE}-unknown-linux-gnu
+        else
+-           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++               | grep -q __ARM_PCS_VFP
++           then
++               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++           else
++               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++           fi
+        fi
+        exit ;;
+     avr32*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     cris:Linux:*:*)
+-       echo cris-axis-linux-gnu
++       echo ${UNAME_MACHINE}-axis-linux-gnu
+        exit ;;
+     crisv32:Linux:*:*)
+-       echo crisv32-axis-linux-gnu
++       echo ${UNAME_MACHINE}-axis-linux-gnu
+        exit ;;
+     frv:Linux:*:*)
+-       echo frv-unknown-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
++       exit ;;
++    hexagon:Linux:*:*)
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     i*86:Linux:*:*)
+        LIBC=gnu
+        eval $set_cc_for_build
+-       sed 's/^        //' << EOF >$dummy.c
++       sed 's/^        //' << EOF >$dummy.c
+        #ifdef __dietlibc__
+        LIBC=dietlibc
+        #endif
+@@ -934,14 +953,14 @@
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
@@ -11869 +13935 @@
 -       echo or32-unknown-linux-gnu
 -       exit ;;
-+       echo or32-unknown-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
 +       exit ;;
      padre:Linux:*:*)
@@ -11882 +13948 @@
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -969,13 +988,13 @@
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     tile*:Linux:*:*)
+-       echo ${UNAME_MACHINE}-tilera-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-gnu
+        exit ;;
+     x86_64:Linux:*:*)
+-       echo x86_64-unknown-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     xtensa*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -1093,7 +1112,7 @@
+          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++         && { echo i486-ncr-sysv4; exit; } ;;
+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+        OS_REL='.3'
+        test -r /etc/.relid \
+@@ -1136,8 +1155,8 @@
+                echo ns32k-sni-sysv
+        fi
+        exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                     # says <Richard.M.Bartel@ccMail.Census.GOV>
++    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                       # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+     *:UNIX_System_V:4*:FTX*)
+@@ -1165,9 +1184,9 @@
+        exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+        if [ -d /usr/nec ]; then
+-               echo mips-nec-sysv${UNAME_RELEASE}
++               echo mips-nec-sysv${UNAME_RELEASE}
+        else
+-               echo mips-unknown-sysv${UNAME_RELEASE}
++               echo mips-unknown-sysv${UNAME_RELEASE}
+        fi
+        exit ;;
+     BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
+@@ -1212,12 +1231,12 @@
+            i386)
+                eval $set_cc_for_build
+                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-                   if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-                       (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-                       grep IS_64BIT_ARCH >/dev/null
+-                   then
+-                       UNAME_PROCESSOR="x86_64"
+-                   fi
++                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++                     grep IS_64BIT_ARCH >/dev/null
++                 then
++                     UNAME_PROCESSOR="x86_64"
++                 fi
+                fi ;;
+            unknown) UNAME_PROCESSOR=powerpc ;;
+        esac
+@@ -1226,8 +1245,8 @@
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+        UNAME_PROCESSOR=`uname -p`
+        if test "$UNAME_PROCESSOR" = "x86"; then
+-           UNAME_PROCESSOR=i386
+-           UNAME_MACHINE=pc
++               UNAME_PROCESSOR=i386
++               UNAME_MACHINE=pc
+        fi
+        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        exit ;;
+@@ -1306,6 +1325,9 @@
+     i*86:AROS:*:*)
+        echo ${UNAME_MACHINE}-pc-aros
+        exit ;;
++    x86_64:VMkernel:*:*)
++       echo ${UNAME_MACHINE}-unknown-esx
++       exit ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1328,11 +1350,11 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++       "4"
+ #else
+-         ""
++       ""
+ #endif
+-         ); exit (0);
++       ); exit (0);
+ #endif
+ #endif
+ 
 diff -Naur ncurses-5.9.orig/config.sub ncurses-5.9/config.sub
---- ncurses-5.9.orig/config.sub 2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/config.sub      2012-02-16 18:25:12.927817113 +0000
-@@ -2,9 +2,9 @@
+--- ncurses-5.9.orig/config.sub 2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/config.sub      2012-08-25 19:58:00.879893949 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 -#   Free Software Foundation, Inc.
-+#   2011 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
  
 -timestamp='2010-09-11'
-+timestamp='2011-04-01'
++timestamp='2012-02-10'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -76,8 +76,8 @@
+@@ -21,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -76,8 +74,8 @@
  GNU config.sub ($timestamp)
  
@@ -11903 +14085 @@
 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 -Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 +Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -175,10 +175,10 @@
+@@ -132,6 +130,10 @@
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+@@ -175,10 +177,10 @@
                 os=-chorusos
                 basic_machine=$1
@@ -11922 +14115 @@
                 os=-hiuxwe2
                 ;;
-@@ -283,12 +283,13 @@
+@@ -247,17 +249,22 @@
+        # Some are omitted here because they have special meanings below.
+        1750a | 580 \
+        | a29k \
++       | aarch64 | aarch64_be \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
+        | bfin \
+        | c4x | clipper \
+        | d10v | d30v | dlx | dsp16xx \
++       | epiphany \
+        | fido | fr30 | frv \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++       | hexagon \
+        | i370 | i860 | i960 | ia64 \
+        | ip2k | iq2000 \
++       | le32 | le64 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore | mep | metag \
+@@ -283,25 +290,26 @@
         | moxie \
         | mt \
@@ -11936 +14152 @@
 +       | powerpc | powerpc64 | powerpc64le | powerpcle \
         | pyramid \
-        | rx \
+-       | rx \
++       | rl78 | rx \
         | score \
-@@ -296,12 +297,12 @@
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
         | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -11947 +14164 @@
 +       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
         | ubicom32 \
-        | v850 | v850e \
+-       | v850 | v850e \
++       | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
         | we32k \
 -       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
@@ -11954 +14172 @@
                 basic_machine=$basic_machine-unknown
                 ;;
-@@ -324,7 +325,15 @@
-        ms1)
+@@ -314,8 +322,7 @@
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
+-       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+-               # Motorola 68HC11/12.
++       m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+                basic_machine=$basic_machine-unknown
+                os=-none
+                ;;
+@@ -325,12 +332,27 @@
                 basic_machine=mt-unknown
                 ;;
--
+ 
 +       strongarm | thumb | xscale)
 +               basic_machine=arm-unknown
++               ;;
++       xgate)
++               basic_machine=$basic_machine-unknown
++               os=-none
 +               ;;
 +       xscaleeb)
 +               basic_machine=armeb-unknown
 +               ;;
++
 +       xscaleel)
 +               basic_machine=armel-unknown
 +               ;;
++
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
-@@ -382,24 +391,25 @@
+        i*86 | x86_64)
+-               basic_machine=$basic_machine-pc
+-               ;;
++         basic_machine=$basic_machine-pc
++         ;;
+        # Object if more than one company name word.
+        *-*-*)
+                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+@@ -339,11 +361,13 @@
+        # Recognize the basic CPU types with company name.
+        580-* \
+        | a29k-* \
++       | aarch64-* | aarch64_be-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+        | avr-* | avr32-* \
++       | be32-* | be64-* \
+        | bfin-* | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | clipper-* | craynv-* | cydra-* \
+@@ -352,8 +376,10 @@
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++       | hexagon-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | ip2k-* | iq2000-* \
++       | le32-* | le64-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
+        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -382,24 +408,26 @@
         | nds32-* | nds32le-* | nds32be-* \
         | nios-* | nios2-* \
@@ -11981 +14247 @@
 +       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
         | pyramid-* \
-        | romp-* | rs6000-* | rx-* \
+-       | romp-* | rs6000-* | rx-* \
++       | rl78-* | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
@@ -11991 +14258 @@
 +       | tahoe-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-        | tile-* | tilegx-* \
+-       | tile-* | tilegx-* \
++       | tile*-* \
         | tron-* \
         | ubicom32-* \
-        | v850-* | v850e-* | vax-* \
+-       | v850-* | v850e-* | vax-* \
++       | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++       | vax-* \
         | we32k-* \
 -       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -12001 +14271 @@
         | ymp-* \
         | z8k-* | z80-*)
-@@ -539,7 +549,7 @@
+@@ -539,7 +567,7 @@
                 basic_machine=craynv-cray
                 os=-unicosmp
@@ -12010 +14280 @@
                 os=-elf
                 ;;
-@@ -826,10 +836,10 @@
-                basic_machine=v70-nec
-                os=-sysv
+@@ -697,7 +725,6 @@
+        i370-ibm* | ibm*)
+                basic_machine=i370-ibm
                 ;;
--       next | m*-next )
-+       next | m*-next)
-                basic_machine=m68k-next
-                case $os in
--                   -nextstep* )
-+                   -nextstep*)
-                        ;;
-                    -ns2*)
-                      os=-nextstep2
-@@ -948,11 +958,14 @@
-        pn)
-                basic_machine=pn-gould
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+        i*86v32)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv32
+@@ -794,10 +821,18 @@
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
--       power)  basic_machine=power-ibm
-+       power)
-+               basic_machine=power-ibm
++       msys)
++               basic_machine=i386-pc
++               os=-msys
++               ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
+                ;;
++       nacl)
++               basic_machine=le32-unknown
++               os=-nacl
++               ;;
+        ncr3000)
+                basic_machine=i486-ncr
+                os=-sysv4
+@@ -950,9 +985,10 @@
+                ;;
+        power)  basic_machine=power-ibm
                 ;;
 -       ppc)    basic_machine=powerpc-unknown
-+       ppc | ppcbe)
-+               basic_machine=powerpc-unknown
++       ppc | ppcbe)    basic_machine=powerpc-unknown
                 ;;
 -       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
@@ -12041 +14320 @@
         ppcle | powerpclittle | ppc-le | powerpc-little)
                 basic_machine=powerpcle-unknown
-@@ -960,9 +973,11 @@
-        ppcle-* | powerpclittle-*)
-                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
--       ppc64)  basic_machine=powerpc64-unknown
-+       ppc64)
-+               basic_machine=powerpc64-unknown
-                ;;
--       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+       ppc64-*)
-+               basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-                basic_machine=powerpc64le-unknown
-@@ -1046,6 +1061,9 @@
+@@ -1046,6 +1082,9 @@
                 basic_machine=i860-stratus
                 os=-sysv4
@@ -12065 +14330 @@
                 basic_machine=m68000-sun
                 ;;
-@@ -1178,6 +1196,9 @@
+@@ -1102,13 +1141,8 @@
+                basic_machine=t90-cray
+                os=-unicos
+                ;;
+-       # This must be matched before tile*.
+-       tilegx*)
+-               basic_machine=tilegx-unknown
+-               os=-linux-gnu
+-               ;;
+        tile*)
+-               basic_machine=tile-unknown
++               basic_machine=$basic_machine-unknown
+                os=-linux-gnu
+                ;;
+        tx39)
+@@ -1178,6 +1212,9 @@
         xps | xps100)
                 basic_machine=xps100-honeywell
@@ -12075 +14355 @@
                 basic_machine=ymp-cray
                 os=-unicos
-@@ -1400,7 +1421,7 @@
-        -nova*)
-                os=-rtmk-nova
+@@ -1315,7 +1352,7 @@
+              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
+-             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++             | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1527,9 +1564,6 @@
                 ;;
--       -ns2 )
-+       -ns2)
-                os=-nextstep2
+        m68000-sun)
+                os=-sunos3
+-               # This also exists in the configure program, but was not the
+-               # default.
+-               # os=-sunos4
                 ;;
-        -nsk*)
-@@ -1597,7 +1618,7 @@
-        m88k-omron*)
-                os=-luna
-                ;;
--       *-next )
-+       *-next)
-                os=-nextstep
-                ;;
-        *-sequent)
+        m68*-cisco)
+                os=-aout
 diff -Naur ncurses-5.9.orig/configure ncurses-5.9/configure
---- ncurses-5.9.orig/configure  2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/configure       2012-02-16 18:25:13.283826506 +0000
-@@ -1,5 +1,5 @@
+--- ncurses-5.9.orig/configure  2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/configure       2012-08-25 19:58:02.356553633 +0000
+@@ -1,7 +1,7 @@
  #! /bin/sh
 -# From configure.in Revision: 1.520 .
-+# From configure.in Revision: 1.541 .
++# From configure.in Revision: 1.552 .
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20101002.
+-# Generated by Autoconf 2.52.20101002.
++# Generated by Autoconf 2.52.20120811.
  #
-@@ -702,6 +702,7 @@
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+@@ -171,15 +171,16 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++infodir='${datarootdir}/info'
++mandir='${datarootdir}/man'
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -230,6 +231,13 @@
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -505,7 +513,7 @@
+ done
+ 
+ # Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
+               localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+@@ -654,15 +662,16 @@
+   --bindir=DIR            user executables [EPREFIX/bin]
+   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR        program executables [EPREFIX/libexec]
+-  --datadir=DIR           read-only architecture-independent data [PREFIX/share]
++  --datarootdir=DIR       read-only architecture-independent data [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --infodir=DIR           info documentation [PREFIX/info]
+-  --mandir=DIR            man documentation [PREFIX/man]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
+ EOF
+ 
+   cat <<\EOF
+@@ -694,14 +703,15 @@
+   --with-rel-version=XXX  override derived release version
+   --with-abi-version=XXX  override derived ABI version
+   --with-system-type=XXX  test: override derived host system-type
++  --without-ada           suppress check for Ada95, don't build demo
+   --without-cxx           do not adjust ncurses bool to match C++
+   --without-cxx-binding   do not build C++ binding and demo
+-  --without-ada           suppress check for Ada95, don't build demo
+   --without-manpages      suppress install of manpages
+   --without-progs         suppress build with programs (e.g., tic)
    --without-tests         suppress build with test-programs
    --without-curses-h      install curses.h as ncurses.h only
@@ -12111 +14467 @@
    --enable-mixed-case     tic should assume mixed-case filenames
    --with-install-prefix   prefixes actual install-location ($DESTDIR)
-@@ -719,6 +720,7 @@
+@@ -719,6 +729,7 @@
    --with-normal           generate normal-libraries (default)
    --with-debug            generate debug-libraries (default)
@@ -12119 +14475 @@
    --with-ticlib           generate separate tic library
    --with-gpm              use Alessandro Rubini's GPM library
-@@ -735,6 +737,7 @@
+@@ -735,6 +746,7 @@
    --with-hashed-db        specify hashed-database library
    --with-fallbacks=XXX    specify list of fallback terminal descriptions
@@ -12127 +14483 @@
    --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
    --disable-big-core      assume machine has little memory
-@@ -1007,7 +1010,7 @@
+@@ -759,6 +771,7 @@
+   --with-ospeed=TYPE      override type of ospeed variable
+   --with-mmask-t=TYPE     override type of mmask_t
+   --with-ccharw-max=XXX   override size CCHARW_MAX
++  --with-tparm-arg=TYPE   override parameter type of tparm
+   --with-rcs-ids          compile-in RCS identifiers
+ Options to Specify How Manpages are Installed:
+   --with-manpage-format   specify manpage-format: gzip/compress/BSDI/normal and
+@@ -796,8 +809,9 @@
+   --disable-scroll-hints  compile without scroll-hints code
+   --enable-wgetch-events  compile with experimental wgetch-events code
+ Testing/development Options:
+-  --enable-echo           build: display "compiling" commands (default)
++  --disable-echo          display "compiling" commands
+   --enable-warnings       build: turn on GCC compiler warnings
++  --enable-string-hacks  work around bogus compiler/loader warnings
+   --enable-assertions     test: turn on generation of assertion code
+   --with-dmalloc          test: use Gray Watson's dmalloc library
+   --with-dbmalloc         test: use Conor Cahill's dbmalloc library
+@@ -883,7 +897,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20101002.  Invocation command line was
++generated by GNU Autoconf 2.52.20120811.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1007,7 +1021,7 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:1010: loading site script $ac_site_file" >&5
-+    { echo "$as_me:1013: loading site script $ac_site_file" >&5
++    { echo "$as_me:1024: 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"
-@@ -1018,7 +1021,7 @@
+@@ -1018,7 +1032,7 @@
    # 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:1021: loading cache $cache_file" >&5
-+    { echo "$as_me:1024: loading cache $cache_file" >&5
++    { echo "$as_me:1035: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -1026,7 +1029,7 @@
+@@ -1026,7 +1040,7 @@
      esac
    fi
  else
 -  { echo "$as_me:1029: creating cache $cache_file" >&5
-+  { echo "$as_me:1032: creating cache $cache_file" >&5
++  { echo "$as_me:1043: creating cache $cache_file" >&5
  echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -1042,21 +1045,21 @@
+@@ -1042,21 +1056,21 @@
    eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:1045: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:1048: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1059: 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:1049: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:1052: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1063: 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=: ;;
@@ -12171 +14555 @@
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -        { echo "$as_me:1055: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:1058: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1069: 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:1057:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:1060:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1071:   former value:  $ac_old_val" >&5
  echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:1059:   current value: $ac_new_val" >&5
-+        { echo "$as_me:1062:   current value: $ac_new_val" >&5
++        { echo "$as_me:1073:   current value: $ac_new_val" >&5
  echo "$as_me:   current value: $ac_new_val" >&2;}
          ac_cache_corrupted=:
        fi;;
-@@ -1075,9 +1078,9 @@
+@@ -1075,9 +1089,9 @@
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:1078: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:1081: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1092: 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:1080: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1083: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1094: 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
-@@ -1098,10 +1101,10 @@
+@@ -1098,10 +1112,10 @@
  echo "#! $SHELL" >conftest.sh
  echo  "exit 0"   >>conftest.sh
  chmod +x conftest.sh
 -if { (echo "$as_me:1101: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1104: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1115: PATH=\".;.\"; conftest.sh") >&5
    (PATH=".;."; conftest.sh) 2>&5
    ac_status=$?
 -  echo "$as_me:1104: \$? = $ac_status" >&5
-+  echo "$as_me:1107: \$? = $ac_status" >&5
++  echo "$as_me:1118: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    ac_path_separator=';'
  else
-@@ -1114,7 +1117,7 @@
+@@ -1114,7 +1128,7 @@
  
  top_builddir=`pwd`
  
 -echo "$as_me:1117: checking for egrep" >&5
-+echo "$as_me:1120: checking for egrep" >&5
++echo "$as_me:1131: 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
-@@ -1124,11 +1127,11 @@
+@@ -1124,11 +1138,11 @@
      else ac_cv_prog_egrep='egrep'
      fi
  fi
 -echo "$as_me:1127: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:1130: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1141: 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:1131: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:1134: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:1145: error: No egrep program found" >&5
  echo "$as_me: error: No egrep program found" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -1138,7 +1141,7 @@
+@@ -1138,7 +1152,7 @@
  cf_cv_abi_version=${NCURSES_MAJOR}
  cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
  cf_cv_timestamp=`date`
 -echo "$as_me:1141: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:1144: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1155: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
  echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
  
  test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
-@@ -1146,7 +1149,7 @@
+@@ -1146,7 +1160,7 @@
  # 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:1149: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-+  { echo "$as_me:1152: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1163: 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;
-@@ -1159,13 +1162,13 @@
+@@ -1159,13 +1173,13 @@
    [0-9]*) #(vi
         ;;
    *)
 -       { { echo "$as_me:1162: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-+       { { echo "$as_me:1165: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++       { { echo "$as_me:1176: 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; }; }
@@ -12259 +14643 @@
  else
 -  { { echo "$as_me:1168: error: Release major-version value is empty" >&5
-+  { { echo "$as_me:1171: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1182: error: Release major-version value is empty" >&5
  echo "$as_me: error: Release major-version value is empty" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1175,13 +1178,13 @@
+@@ -1175,13 +1189,13 @@
    [0-9]*) #(vi
         ;;
    *)
 -       { { echo "$as_me:1178: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-+       { { echo "$as_me:1181: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++       { { echo "$as_me:1192: 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; }; }
@@ -12275 +14659 @@
  else
 -  { { echo "$as_me:1184: error: Release minor-version value is empty" >&5
-+  { { echo "$as_me:1187: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1198: error: Release minor-version value is empty" >&5
  echo "$as_me: error: Release minor-version value is empty" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1191,7 +1194,7 @@
+@@ -1191,7 +1205,7 @@
  # Check whether --with-abi-version or --without-abi-version was given.
  if test "${with_abi_version+set}" = set; then
    withval="$with_abi_version"
 -  { echo "$as_me:1194: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-+  { echo "$as_me:1197: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++  { echo "$as_me:1208: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
  echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
   cf_cv_abi_version=$withval
  fi;
-@@ -1201,13 +1204,13 @@
+@@ -1201,13 +1215,13 @@
    [0-9]*) #(vi
         ;;
    *)
 -       { { echo "$as_me:1204: error: ABI version is not a number: $cf_cv_abi_version" >&5
-+       { { echo "$as_me:1207: error: ABI version is not a number: $cf_cv_abi_version" >&5
++       { { echo "$as_me:1218: 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; }; }
@@ -12300 +14684 @@
  else
 -  { { echo "$as_me:1210: error: ABI version value is empty" >&5
-+  { { echo "$as_me:1213: error: ABI version value is empty" >&5
++  { { echo "$as_me:1224: error: ABI version value is empty" >&5
  echo "$as_me: error: ABI version value is empty" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1229,7 +1232,7 @@
+@@ -1229,7 +1243,7 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:1232: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1235: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1246: 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
-@@ -1239,11 +1242,11 @@
+@@ -1239,11 +1253,11 @@
  
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:1242: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1245: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1256: error: cannot run $ac_config_sub" >&5
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:1246: checking build system type" >&5
-+echo "$as_me:1249: checking build system type" >&5
++echo "$as_me:1260: 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
-@@ -1252,23 +1255,23 @@
+@@ -1252,23 +1266,23 @@
  test -z "$ac_cv_build_alias" &&
    ac_cv_build_alias=`$ac_config_guess`
  test -z "$ac_cv_build_alias" &&
 -  { { echo "$as_me:1255: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1258: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1269: error: cannot guess build type; you must specify one" >&5
  echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
  ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 -  { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1262: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1273: 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; }; }
@@ -12343 +14727 @@
  fi
 -echo "$as_me:1264: result: $ac_cv_build" >&5
-+echo "$as_me:1267: result: $ac_cv_build" >&5
++echo "$as_me:1278: result: $ac_cv_build" >&5
  echo "${ECHO_T}$ac_cv_build" >&6
  build=$ac_cv_build
@@ -12351 +14735 @@
  
 -echo "$as_me:1271: checking host system type" >&5
-+echo "$as_me:1274: checking host system type" >&5
++echo "$as_me:1285: 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
-@@ -1277,12 +1280,12 @@
+@@ -1277,12 +1291,12 @@
  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:1280: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1283: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1294: 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; }; }
@@ -12366 +14750 @@
  fi
 -echo "$as_me:1285: result: $ac_cv_host" >&5
-+echo "$as_me:1288: result: $ac_cv_host" >&5
++echo "$as_me:1299: result: $ac_cv_host" >&5
  echo "${ECHO_T}$ac_cv_host" >&6
  host=$ac_cv_host
  host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1290,7 +1293,7 @@
+@@ -1290,7 +1304,7 @@
  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:1293: checking target system type" >&5
-+       echo "$as_me:1296: checking target system type" >&5
++       echo "$as_me:1307: 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
-@@ -1299,12 +1302,12 @@
+@@ -1299,12 +1313,12 @@
  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:1302: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1305: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1316: 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; }; }
@@ -12390 +14774 @@
  fi
 -echo "$as_me:1307: result: $ac_cv_target" >&5
-+echo "$as_me:1310: result: $ac_cv_target" >&5
++echo "$as_me:1321: result: $ac_cv_target" >&5
  echo "${ECHO_T}$ac_cv_target" >&6
  target=$ac_cv_target
  target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1335,13 +1338,13 @@
+@@ -1335,13 +1349,13 @@
  fi
  
  test -z "$system_name" && system_name="$cf_cv_system_name"
 -test -n "$cf_cv_system_name" && echo "$as_me:1338: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1341: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1352: 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 "$as_me:1342: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+       echo "$as_me:1345: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++       echo "$as_me:1356: 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 "$as_me:1344: error: \"Please remove config.cache and try again.\"" >&5
-+       { { echo "$as_me:1347: error: \"Please remove config.cache and try again.\"" >&5
++       { { echo "$as_me:1358: 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
-@@ -1349,7 +1352,7 @@
+@@ -1349,7 +1363,7 @@
  # 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:1352: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1355: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1366: WARNING: overriding system type to $withval" >&5
  echo "$as_me: WARNING: overriding system type to $withval" >&2;}
   cf_cv_system_name=$withval
  fi;
-@@ -1359,23 +1362,23 @@
+@@ -1359,23 +1373,23 @@
  
  ###    Default install-location
  
 -echo "$as_me:1362: checking for prefix" >&5
-+echo "$as_me:1365: checking for prefix" >&5
++echo "$as_me:1376: checking for prefix" >&5
  echo $ECHO_N "checking for prefix... $ECHO_C" >&6
  if test "x$prefix" = "xNONE" ; then
@@ -12439 +14823 @@
  fi
 -echo "$as_me:1374: result: $prefix" >&5
-+echo "$as_me:1377: result: $prefix" >&5
++echo "$as_me:1388: result: $prefix" >&5
  echo "${ECHO_T}$prefix" >&6
  
  if test "x$prefix" = "xNONE" ; then
 -echo "$as_me:1378: checking for default include-directory" >&5
-+echo "$as_me:1381: checking for default include-directory" >&5
++echo "$as_me:1392: 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 \
-@@ -1398,7 +1401,7 @@
+@@ -1398,11 +1412,26 @@
         fi
         test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
  done
 -echo "$as_me:1401: result: $includedir" >&5
-+echo "$as_me:1404: result: $includedir" >&5
++echo "$as_me:1415: result: $includedir" >&5
  echo "${ECHO_T}$includedir" >&6
  fi
  
-@@ -1412,7 +1415,7 @@
+ ###    Checks for programs.
++
++# Check whether --with-ada or --without-ada was given.
++if test "${with_ada+set}" = set; then
++  withval="$with_ada"
++  cf_with_ada=$withval
++else
++  cf_with_ada=yes
++fi;
++if test x"$cf_with_ada" = xyes
++then
++       cf_PROG_CC="gnatgcc gcc cc"
++else
++       cf_PROG_CC="gcc cc"
++fi
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -1410,213 +1439,11 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 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
+-  # 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:1415: checking for $ac_word" >&5
-+echo "$as_me:1418: 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
-@@ -1427,7 +1430,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-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
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc"
 -echo "$as_me:1430: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1433: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1435,10 +1438,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1438: result: $CC" >&5
-+  echo "$as_me:1441: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1441: result: no" >&5
-+  echo "$as_me:1444: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1447,7 +1450,7 @@
-   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 "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-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
 -echo "$as_me:1450: checking for $ac_word" >&5
-+echo "$as_me:1453: 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
-@@ -1462,7 +1465,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="gcc"
+-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
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="gcc"
 -echo "$as_me:1465: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1468: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1470,10 +1473,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1473: result: $ac_ct_CC" >&5
-+  echo "$as_me:1476: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1476: result: no" >&5
-+  echo "$as_me:1479: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1486,7 +1489,7 @@
-   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 "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-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
 -echo "$as_me:1489: checking for $ac_word" >&5
-+echo "$as_me:1492: 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
-@@ -1501,7 +1504,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}cc"
+-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
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
 -echo "$as_me:1504: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1507: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1509,10 +1512,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1512: result: $CC" >&5
-+  echo "$as_me:1515: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1515: result: no" >&5
-+  echo "$as_me:1518: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1521,7 +1524,7 @@
-   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 "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-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
 -echo "$as_me:1524: checking for $ac_word" >&5
-+echo "$as_me:1527: 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
-@@ -1536,7 +1539,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="cc"
+-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
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="cc"
 -echo "$as_me:1539: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1542: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1544,10 +1547,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1547: result: $ac_ct_CC" >&5
-+  echo "$as_me:1550: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1550: result: no" >&5
-+  echo "$as_me:1553: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1560,7 +1563,7 @@
- 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 "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-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
 -echo "$as_me:1563: checking for $ac_word" >&5
-+echo "$as_me:1566: 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
-@@ -1580,7 +1583,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
+-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
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-  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
+-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-  ac_prog_rejected=yes
+-  continue
+-fi
+-ac_cv_prog_CC="cc"
 -echo "$as_me:1583: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1586: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1602,10 +1605,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-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
+-  if test $# != 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+-    shift
+-    ac_cv_prog_CC="$@"
+-  fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1605: result: $CC" >&5
-+  echo "$as_me:1608: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1608: result: no" >&5
-+  echo "$as_me:1611: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1616,7 +1619,7 @@
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  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:1619: checking for $ac_word" >&5
-+echo "$as_me:1622: checking for $ac_word" >&5
++echo "$as_me:1446: 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
-@@ -1631,7 +1634,7 @@
+@@ -1631,7 +1458,7 @@
    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:1634: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1637: found $ac_dir/$ac_word" >&5
++echo "$as_me:1461: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1639,10 +1642,10 @@
+@@ -1639,10 +1466,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1642: result: $CC" >&5
-+  echo "$as_me:1645: result: $CC" >&5
++  echo "$as_me:1469: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1645: result: no" >&5
-+  echo "$as_me:1648: result: no" >&5
++  echo "$as_me:1472: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1655,7 +1658,7 @@
+@@ -1651,11 +1478,11 @@
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in $cf_PROG_CC
  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:1658: checking for $ac_word" >&5
-+echo "$as_me:1661: checking for $ac_word" >&5
++echo "$as_me:1485: 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
-@@ -1670,7 +1673,7 @@
+@@ -1670,7 +1497,7 @@
    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:1673: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1676: found $ac_dir/$ac_word" >&5
++echo "$as_me:1500: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1678,10 +1681,10 @@
+@@ -1678,10 +1505,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1681: result: $ac_ct_CC" >&5
-+  echo "$as_me:1684: result: $ac_ct_CC" >&5
++  echo "$as_me:1508: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1684: result: no" >&5
-+  echo "$as_me:1687: result: no" >&5
++  echo "$as_me:1511: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1693,32 +1696,32 @@
- 
- fi
- 
+@@ -1691,34 +1518,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-fi
+-
 -test -z "$CC" && { { echo "$as_me:1696: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1699: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1521: error: no acceptable cc found in \$PATH" >&5
  echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
@@ -12685 +15147 @@
  # Provide some information about the compiler.
 -echo "$as_me:1701:" \
-+echo "$as_me:1704:" \
++echo "$as_me:1526:" \
       "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:1704: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1707: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1529: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1707: \$? = $ac_status" >&5
-+  echo "$as_me:1710: \$? = $ac_status" >&5
++  echo "$as_me:1532: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1709: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1712: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1534: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1712: \$? = $ac_status" >&5
-+  echo "$as_me:1715: \$? = $ac_status" >&5
++  echo "$as_me:1537: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1714: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1717: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1539: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1717: \$? = $ac_status" >&5
-+  echo "$as_me:1720: \$? = $ac_status" >&5
++  echo "$as_me:1542: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 1721 "configure"
-+#line 1724 "configure"
++#line 1546 "configure"
  #include "confdefs.h"
  
  int
-@@ -1734,13 +1737,13 @@
+@@ -1734,13 +1559,13 @@
  # 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:1737: checking for C compiler default output" >&5
-+echo "$as_me:1740: checking for C compiler default output" >&5
++echo "$as_me:1562: checking for C compiler default output" >&5
  echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 -if { (eval echo "$as_me:1740: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1743: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1565: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
 -  echo "$as_me:1743: \$? = $ac_status" >&5
-+  echo "$as_me:1746: \$? = $ac_status" >&5
++  echo "$as_me:1568: \$? = $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
-@@ -1763,34 +1766,34 @@
+@@ -1763,34 +1588,34 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1766: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1769: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1591: error: C compiler cannot create executables" >&5
  echo "$as_me: error: C compiler cannot create executables" >&2;}
     { (exit 77); exit 77; }; }
@@ -12745 +15207 @@
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:1772: result: $ac_file" >&5
-+echo "$as_me:1775: result: $ac_file" >&5
++echo "$as_me:1597: result: $ac_file" >&5
  echo "${ECHO_T}$ac_file" >&6
  
@@ -12751 +15213 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1777: checking whether the C compiler works" >&5
-+echo "$as_me:1780: checking whether the C compiler works" >&5
++echo "$as_me:1602: 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
@@ -12758 +15220 @@
    if { ac_try='./$ac_file'
 -  { (eval echo "$as_me:1783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1608: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1786: \$? = $ac_status" >&5
-+  echo "$as_me:1789: \$? = $ac_status" >&5
++  echo "$as_me:1611: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
@@ -12770 +15232 @@
      else
 -       { { echo "$as_me:1793: error: cannot run C compiled programs.
-+       { { echo "$as_me:1796: error: cannot run C compiled programs.
++       { { echo "$as_me:1618: 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;}
-@@ -1798,24 +1801,24 @@
+@@ -1798,24 +1623,24 @@
      fi
    fi
  fi
 -echo "$as_me:1801: result: yes" >&5
-+echo "$as_me:1804: result: yes" >&5
++echo "$as_me:1626: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
@@ -12787 +15249 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1808: checking whether we are cross compiling" >&5
-+echo "$as_me:1811: checking whether we are cross compiling" >&5
++echo "$as_me:1633: checking whether we are cross compiling" >&5
  echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:1810: result: $cross_compiling" >&5
-+echo "$as_me:1813: result: $cross_compiling" >&5
++echo "$as_me:1635: result: $cross_compiling" >&5
  echo "${ECHO_T}$cross_compiling" >&6
  
 -echo "$as_me:1813: checking for executable suffix" >&5
-+echo "$as_me:1816: checking for executable suffix" >&5
++echo "$as_me:1638: checking for executable suffix" >&5
  echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 -if { (eval echo "$as_me:1815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1640: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:1818: \$? = $ac_status" >&5
-+  echo "$as_me:1821: \$? = $ac_status" >&5
++  echo "$as_me:1643: \$? = $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
-@@ -1831,25 +1834,25 @@
+@@ -1831,25 +1656,25 @@
    esac
  done
  else
 -  { { echo "$as_me:1834: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1837: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1659: 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; }; }
@@ -12817 +15279 @@
  rm -f conftest$ac_cv_exeext
 -echo "$as_me:1840: result: $ac_cv_exeext" >&5
-+echo "$as_me:1843: result: $ac_cv_exeext" >&5
++echo "$as_me:1665: result: $ac_cv_exeext" >&5
  echo "${ECHO_T}$ac_cv_exeext" >&6
  
@@ -12824 +15286 @@
  ac_exeext=$EXEEXT
 -echo "$as_me:1846: checking for object suffix" >&5
-+echo "$as_me:1849: checking for object suffix" >&5
++echo "$as_me:1671: checking for object suffix" >&5
  echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
  if test "${ac_cv_objext+set}" = set; then
@@ -12831 +15293 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1852 "configure"
-+#line 1855 "configure"
++#line 1677 "configure"
  #include "confdefs.h"
  
  int
-@@ -1861,10 +1864,10 @@
+@@ -1861,10 +1686,10 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1867: \$? = $ac_status" >&5
-+  echo "$as_me:1870: \$? = $ac_status" >&5
++  echo "$as_me:1692: \$? = $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
-@@ -1876,24 +1879,24 @@
+@@ -1876,24 +1701,24 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1879: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1882: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1704: error: cannot compute OBJEXT: cannot compile" >&5
  echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
     { (exit 1); exit 1; }; }
@@ -12861 +15323 @@
  fi
 -echo "$as_me:1886: result: $ac_cv_objext" >&5
-+echo "$as_me:1889: result: $ac_cv_objext" >&5
++echo "$as_me:1711: result: $ac_cv_objext" >&5
  echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:1890: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1893: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1715: 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
@@ -12873 +15335 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1896 "configure"
-+#line 1899 "configure"
++#line 1721 "configure"
  #include "confdefs.h"
  
  int
-@@ -1908,16 +1911,16 @@
+@@ -1908,16 +1733,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1736: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1914: \$? = $ac_status" >&5
-+  echo "$as_me:1917: \$? = $ac_status" >&5
++  echo "$as_me:1739: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1917: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1742: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1920: \$? = $ac_status" >&5
-+  echo "$as_me:1923: \$? = $ac_status" >&5
++  echo "$as_me:1745: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -1929,19 +1932,19 @@
+@@ -1929,19 +1754,19 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:1932: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1935: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1757: result: $ac_cv_c_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -12910 +15372 @@
  CFLAGS="-g"
 -echo "$as_me:1938: checking whether $CC accepts -g" >&5
-+echo "$as_me:1941: checking whether $CC accepts -g" >&5
++echo "$as_me:1763: 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
@@ -12917 +15379 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1944 "configure"
-+#line 1947 "configure"
++#line 1769 "configure"
  #include "confdefs.h"
  
  int
-@@ -1953,16 +1956,16 @@
+@@ -1953,16 +1778,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1959: \$? = $ac_status" >&5
-+  echo "$as_me:1962: \$? = $ac_status" >&5
++  echo "$as_me:1784: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1962: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1787: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1965: \$? = $ac_status" >&5
-+  echo "$as_me:1968: \$? = $ac_status" >&5
++  echo "$as_me:1790: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
-@@ -1972,7 +1975,7 @@
+@@ -1972,7 +1797,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:1975: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1978: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1800: 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
-@@ -1999,16 +2002,16 @@
+@@ -1999,16 +1824,16 @@
  #endif
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2005: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1827: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2005: \$? = $ac_status" >&5
-+  echo "$as_me:2008: \$? = $ac_status" >&5
++  echo "$as_me:1830: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2011: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1833: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2011: \$? = $ac_status" >&5
-+  echo "$as_me:2014: \$? = $ac_status" >&5
++  echo "$as_me:1836: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
     ''\
-@@ -2020,7 +2023,7 @@
+@@ -2020,7 +1845,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2023 "configure"
-+#line 2026 "configure"
++#line 1848 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -2033,16 +2036,16 @@
+@@ -2033,16 +1858,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1861: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2039: \$? = $ac_status" >&5
-+  echo "$as_me:2042: \$? = $ac_status" >&5
++  echo "$as_me:1864: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2042: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1867: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2045: \$? = $ac_status" >&5
-+  echo "$as_me:2048: \$? = $ac_status" >&5
++  echo "$as_me:1870: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -2052,7 +2055,7 @@
+@@ -2052,7 +1877,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2055 "configure"
-+#line 2058 "configure"
++#line 1880 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -2064,16 +2067,16 @@
+@@ -2064,16 +1889,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1892: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2070: \$? = $ac_status" >&5
-+  echo "$as_me:2073: \$? = $ac_status" >&5
++  echo "$as_me:1895: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2073: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1898: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2076: \$? = $ac_status" >&5
-+  echo "$as_me:2079: \$? = $ac_status" >&5
++  echo "$as_me:1901: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -2103,11 +2106,11 @@
+@@ -2103,11 +1928,11 @@
  
  GCC_VERSION=none
  if test "$GCC" = yes ; then
 -       echo "$as_me:2106: checking version of $CC" >&5
-+       echo "$as_me:2109: checking version of $CC" >&5
++       echo "$as_me:1931: 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/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
         test -z "$GCC_VERSION" && GCC_VERSION=unknown
 -       echo "$as_me:2110: result: $GCC_VERSION" >&5
-+       echo "$as_me:2113: result: $GCC_VERSION" >&5
++       echo "$as_me:1935: result: $GCC_VERSION" >&5
  echo "${ECHO_T}$GCC_VERSION" >&6
  fi
  
-@@ -2117,7 +2120,7 @@
+@@ -2117,7 +1942,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
 -echo "$as_me:2120: checking how to run the C preprocessor" >&5
-+echo "$as_me:2123: checking how to run the C preprocessor" >&5
++echo "$as_me:1945: 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
-@@ -2138,18 +2141,18 @@
+@@ -2138,18 +1963,18 @@
    # 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 2141 "configure"
-+#line 2144 "configure"
++#line 1966 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -13066 +15528 @@
  _ACEOF
 -if { (eval echo "$as_me:2146: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2149: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1971: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13073 +15535 @@
    cat conftest.err >&5
 -  echo "$as_me:2152: \$? = $ac_status" >&5
-+  echo "$as_me:2155: \$? = $ac_status" >&5
++  echo "$as_me:1977: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2172,17 +2175,17 @@
+@@ -2172,17 +1997,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2175 "configure"
-+#line 2178 "configure"
++#line 2000 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2179: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2182: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2004: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13094 +15556 @@
    cat conftest.err >&5
 -  echo "$as_me:2185: \$? = $ac_status" >&5
-+  echo "$as_me:2188: \$? = $ac_status" >&5
++  echo "$as_me:2010: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2219,7 +2222,7 @@
+@@ -2219,7 +2044,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:2222: result: $CPP" >&5
-+echo "$as_me:2225: result: $CPP" >&5
++echo "$as_me:2047: result: $CPP" >&5
  echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -2229,18 +2232,18 @@
+@@ -2229,18 +2054,18 @@
    # 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 2232 "configure"
-+#line 2235 "configure"
++#line 2057 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -13118 +15580 @@
  _ACEOF
 -if { (eval echo "$as_me:2237: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2240: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2062: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13125 +15587 @@
    cat conftest.err >&5
 -  echo "$as_me:2243: \$? = $ac_status" >&5
-+  echo "$as_me:2246: \$? = $ac_status" >&5
++  echo "$as_me:2068: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2263,17 +2266,17 @@
+@@ -2263,17 +2088,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2266 "configure"
-+#line 2269 "configure"
++#line 2091 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2270: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2273: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2095: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13146 +15608 @@
    cat conftest.err >&5
 -  echo "$as_me:2276: \$? = $ac_status" >&5
-+  echo "$as_me:2279: \$? = $ac_status" >&5
++  echo "$as_me:2101: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2301,7 +2304,7 @@
+@@ -2301,7 +2126,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:2304: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2307: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2129: error: C preprocessor \"$CPP\" fails sanity check" >&5
  echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -2314,14 +2317,14 @@
+@@ -2314,14 +2139,14 @@
  ac_main_return=return
  
  if test $ac_cv_c_compiler_gnu = yes; then
 -    echo "$as_me:2317: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2320: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2142: 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
@@ -13172 +15634 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2324 "configure"
-+#line 2327 "configure"
++#line 2149 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  int Autoconf = TIOCGETP;
-@@ -2336,7 +2339,7 @@
+@@ -2336,7 +2161,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat >conftest.$ac_ext <<_ACEOF
 -#line 2339 "configure"
-+#line 2342 "configure"
++#line 2164 "configure"
  #include "confdefs.h"
  #include <termio.h>
  int Autoconf = TCGETA;
-@@ -2349,14 +2352,14 @@
+@@ -2349,14 +2174,14 @@
  
    fi
  fi
 -echo "$as_me:2352: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2355: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2177: 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
@@ -13198 +15660 @@
  
 -echo "$as_me:2359: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2362: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2184: 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
-@@ -2372,15 +2375,15 @@
+@@ -2372,15 +2197,15 @@
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 -if { (eval echo "$as_me:2375: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2378: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2200: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2378: \$? = $ac_status" >&5
-+  echo "$as_me:2381: \$? = $ac_status" >&5
++  echo "$as_me:2203: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -  test -f conftest2.$ac_objext && { (eval echo "$as_me:2380: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2383: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2205: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2383: \$? = $ac_status" >&5
-+  echo "$as_me:2386: \$? = $ac_status" >&5
++  echo "$as_me:2208: \$? = $ac_status" >&5
    (exit $ac_status); };
  then
    eval cf_cv_prog_CC_c_o=yes
-@@ -2391,19 +2394,19 @@
+@@ -2391,19 +2216,19 @@
  
  fi
  if test $cf_cv_prog_CC_c_o = yes; then
 -  echo "$as_me:2394: result: yes" >&5
-+  echo "$as_me:2397: result: yes" >&5
++  echo "$as_me:2219: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:2397: result: no" >&5
-+  echo "$as_me:2400: result: no" >&5
++  echo "$as_me:2222: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:2401: checking for POSIXized ISC" >&5
-+echo "$as_me:2404: checking for POSIXized ISC" >&5
++echo "$as_me:2226: checking for POSIXized ISC" >&5
  echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
  if test -d /etc/conf/kconfig.d &&
@@ -13242 +15704 @@
  then
 -  echo "$as_me:2406: result: yes" >&5
-+  echo "$as_me:2409: result: yes" >&5
++  echo "$as_me:2231: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    ISC=yes # If later tests want to check for ISC.
  
-@@ -2417,12 +2420,115 @@
+@@ -2417,12 +2242,115 @@
      CC="$CC -Xp"
    fi
  else
 -  echo "$as_me:2420: result: no" >&5
-+  echo "$as_me:2423: result: no" >&5
++  echo "$as_me:2245: result: no" >&5
  echo "${ECHO_T}no" >&6
    ISC=
@@ -13263 +15725 @@
 +# into CC.  This will not help with broken scripts that wrap the compiler with
 +# options, but eliminates a more common category of user confusion.
-+echo "$as_me:2434: checking \$CC variable" >&5
++echo "$as_me:2256: checking \$CC variable" >&5
 +echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 +case "$CC" in #(vi
 +*[\ \  ]-[IUD]*)
-+       echo "$as_me:2438: result: broken" >&5
++       echo "$as_me:2260: result: broken" >&5
 +echo "${ECHO_T}broken" >&6
-+       { echo "$as_me:2440: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++       { echo "$as_me:2262: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 +echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 +       # humor him...
@@ -13355 +15817 @@
 +       ;;
 +*)
-+       echo "$as_me:2526: result: ok" >&5
++       echo "$as_me:2348: result: ok" >&5
 +echo "${ECHO_T}ok" >&6
 +       ;;
 +esac
 +
-+echo "$as_me:2531: checking for ${CC:-cc} option to accept ANSI C" >&5
++echo "$as_me:2353: checking for ${CC:-cc} option to accept ANSI C" >&5
  echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
  if test "${cf_cv_ansi_cc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2526,7 +2632,7 @@
+@@ -2526,7 +2454,7 @@
  fi
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2529 "configure"
-+#line 2635 "configure"
++#line 2457 "configure"
  #include "confdefs.h"
  
  #ifndef CC_HAS_PROTOS
-@@ -2547,16 +2653,16 @@
+@@ -2547,16 +2475,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2478: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2553: \$? = $ac_status" >&5
-+  echo "$as_me:2659: \$? = $ac_status" >&5
++  echo "$as_me:2481: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2556: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2484: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2559: \$? = $ac_status" >&5
-+  echo "$as_me:2665: \$? = $ac_status" >&5
++  echo "$as_me:2487: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ansi_cc="$cf_arg"; break
  else
-@@ -2569,7 +2675,7 @@
+@@ -2569,7 +2497,7 @@
  CPPFLAGS="$cf_save_CPPFLAGS"
  
  fi
 -echo "$as_me:2572: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2678: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2500: result: $cf_cv_ansi_cc" >&5
  echo "${ECHO_T}$cf_cv_ansi_cc" >&6
  
  if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2662,7 +2768,7 @@
+@@ -2662,7 +2590,7 @@
  fi
  
  if test "$cf_cv_ansi_cc" = "no"; then
 -       { { echo "$as_me:2665: error: Your compiler does not appear to recognize prototypes.
-+       { { echo "$as_me:2771: error: Your compiler does not appear to recognize prototypes.
++       { { echo "$as_me:2593: error: Your compiler does not appear to recognize prototypes.
  You have the following choices:
         a. adjust your compiler options
         b. get an up-to-date compiler
-@@ -2696,13 +2802,13 @@
+@@ -2696,13 +2624,13 @@
    LDCONFIG=:
  else
@@ -13424 +15886 @@
  set dummy ldconfig; ac_word=$2
 -echo "$as_me:2705: checking for $ac_word" >&5
-+echo "$as_me:2811: checking for $ac_word" >&5
++echo "$as_me:2633: 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
-@@ -2719,7 +2825,7 @@
+@@ -2719,7 +2647,7 @@
    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:2722: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2828: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2650: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -2730,10 +2836,10 @@
+@@ -2730,10 +2658,10 @@
  LDCONFIG=$ac_cv_path_LDCONFIG
  
  if test -n "$LDCONFIG"; then
 -  echo "$as_me:2733: result: $LDCONFIG" >&5
-+  echo "$as_me:2839: result: $LDCONFIG" >&5
++  echo "$as_me:2661: result: $LDCONFIG" >&5
  echo "${ECHO_T}$LDCONFIG" >&6
  else
 -  echo "$as_me:2736: result: no" >&5
-+  echo "$as_me:2842: result: no" >&5
++  echo "$as_me:2664: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2741,7 +2847,7 @@
+@@ -2741,7 +2669,7 @@
  esac
  fi
  
 -echo "$as_me:2744: checking if you want to ensure bool is consistent with C++" >&5
-+echo "$as_me:2850: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2672: 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.
-@@ -2751,7 +2857,7 @@
+@@ -2751,7 +2679,7 @@
  else
    cf_with_cxx=yes
  fi;
 -echo "$as_me:2754: result: $cf_with_cxx" >&5
-+echo "$as_me:2860: result: $cf_with_cxx" >&5
++echo "$as_me:2682: result: $cf_with_cxx" >&5
  echo "${ECHO_T}$cf_with_cxx" >&6
  if test "X$cf_with_cxx" = Xno ; then
         CXX=""
-@@ -2769,7 +2875,7 @@
+@@ -2769,7 +2697,7 @@
    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:2772: checking for $ac_word" >&5
-+echo "$as_me:2878: checking for $ac_word" >&5
++echo "$as_me:2700: 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
-@@ -2784,7 +2890,7 @@
+@@ -2784,7 +2712,7 @@
    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:2787: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2893: found $ac_dir/$ac_word" >&5
++echo "$as_me:2715: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2792,10 +2898,10 @@
+@@ -2792,10 +2720,10 @@
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
 -  echo "$as_me:2795: result: $CXX" >&5
-+  echo "$as_me:2901: result: $CXX" >&5
++  echo "$as_me:2723: result: $CXX" >&5
  echo "${ECHO_T}$CXX" >&6
  else
 -  echo "$as_me:2798: result: no" >&5
-+  echo "$as_me:2904: result: no" >&5
++  echo "$as_me:2726: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2808,7 +2914,7 @@
+@@ -2808,7 +2736,7 @@
  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:2811: checking for $ac_word" >&5
-+echo "$as_me:2917: checking for $ac_word" >&5
++echo "$as_me:2739: 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
-@@ -2823,7 +2929,7 @@
+@@ -2823,7 +2751,7 @@
    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:2826: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2932: found $ac_dir/$ac_word" >&5
++echo "$as_me:2754: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2831,10 +2937,10 @@
+@@ -2831,10 +2759,10 @@
  fi
  ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  if test -n "$ac_ct_CXX"; then
 -  echo "$as_me:2834: result: $ac_ct_CXX" >&5
-+  echo "$as_me:2940: result: $ac_ct_CXX" >&5
++  echo "$as_me:2762: result: $ac_ct_CXX" >&5
  echo "${ECHO_T}$ac_ct_CXX" >&6
  else
 -  echo "$as_me:2837: result: no" >&5
-+  echo "$as_me:2943: result: no" >&5
++  echo "$as_me:2765: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2846,32 +2952,32 @@
+@@ -2846,32 +2774,32 @@
  fi
  
  # Provide some information about the compiler.
 -echo "$as_me:2849:" \
-+echo "$as_me:2955:" \
++echo "$as_me:2777:" \
       "checking for C++ compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:2852: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2958: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2780: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:2855: \$? = $ac_status" >&5
-+  echo "$as_me:2961: \$? = $ac_status" >&5
++  echo "$as_me:2783: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:2857: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2963: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2785: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:2860: \$? = $ac_status" >&5
-+  echo "$as_me:2966: \$? = $ac_status" >&5
++  echo "$as_me:2788: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:2862: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2968: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2790: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:2865: \$? = $ac_status" >&5
-+  echo "$as_me:2971: \$? = $ac_status" >&5
++  echo "$as_me:2793: \$? = $ac_status" >&5
    (exit $ac_status); }
  
 -echo "$as_me:2868: checking whether we are using the GNU C++ compiler" >&5
-+echo "$as_me:2974: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:2796: 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
@@ -13568 +16030 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2874 "configure"
-+#line 2980 "configure"
++#line 2802 "configure"
  #include "confdefs.h"
  
  int
-@@ -2886,16 +2992,16 @@
+@@ -2886,16 +2814,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2889: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2817: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2892: \$? = $ac_status" >&5
-+  echo "$as_me:2998: \$? = $ac_status" >&5
++  echo "$as_me:2820: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2895: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2823: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2898: \$? = $ac_status" >&5
-+  echo "$as_me:3004: \$? = $ac_status" >&5
++  echo "$as_me:2826: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -2907,19 +3013,19 @@
+@@ -2907,19 +2835,19 @@
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:2910: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "$as_me:3016: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2838: result: $ac_cv_cxx_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
  GXX=`test $ac_compiler_gnu = yes && echo yes`
@@ -13605 +16067 @@
  CXXFLAGS="-g"
 -echo "$as_me:2916: checking whether $CXX accepts -g" >&5
-+echo "$as_me:3022: checking whether $CXX accepts -g" >&5
++echo "$as_me:2844: 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
@@ -13612 +16074 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2922 "configure"
-+#line 3028 "configure"
++#line 2850 "configure"
  #include "confdefs.h"
  
  int
-@@ -2931,16 +3037,16 @@
+@@ -2931,16 +2859,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2934: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2937: \$? = $ac_status" >&5
-+  echo "$as_me:3043: \$? = $ac_status" >&5
++  echo "$as_me:2865: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2868: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2943: \$? = $ac_status" >&5
-+  echo "$as_me:3049: \$? = $ac_status" >&5
++  echo "$as_me:2871: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cxx_g=yes
  else
-@@ -2950,7 +3056,7 @@
+@@ -2950,7 +2878,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2953: result: $ac_cv_prog_cxx_g" >&5
-+echo "$as_me:3059: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:2881: 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
-@@ -2977,7 +3083,7 @@
+@@ -2977,7 +2905,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2980 "configure"
-+#line 3086 "configure"
++#line 2908 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -2990,16 +3096,16 @@
+@@ -2990,16 +2918,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3099: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2921: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2996: \$? = $ac_status" >&5
-+  echo "$as_me:3102: \$? = $ac_status" >&5
++  echo "$as_me:2924: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2999: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3105: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2927: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3002: \$? = $ac_status" >&5
-+  echo "$as_me:3108: \$? = $ac_status" >&5
++  echo "$as_me:2930: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3009,7 +3115,7 @@
+@@ -3009,7 +2937,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 3012 "configure"
-+#line 3118 "configure"
++#line 2940 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -3021,16 +3127,16 @@
+@@ -3021,16 +2949,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3130: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3027: \$? = $ac_status" >&5
-+  echo "$as_me:3133: \$? = $ac_status" >&5
++  echo "$as_me:2955: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3030: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2958: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3033: \$? = $ac_status" >&5
-+  echo "$as_me:3139: \$? = $ac_status" >&5
++  echo "$as_me:2961: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -3057,7 +3163,7 @@
+@@ -3053,11 +2981,11 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-               # autoconf 2.5x removed the error - by hardcoding it to g++.
++               # 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:3060: checking for $ac_word" >&5
-+echo "$as_me:3166: checking for $ac_word" >&5
++echo "$as_me:2988: 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
-@@ -3074,7 +3180,7 @@
+@@ -3074,7 +3002,7 @@
    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:3077: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3183: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3005: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -3085,16 +3191,16 @@
+@@ -3085,28 +3013,30 @@
  CXX=$ac_cv_path_CXX
  
  if test -n "$CXX"; then
 -  echo "$as_me:3088: result: $CXX" >&5
-+  echo "$as_me:3194: result: $CXX" >&5
++  echo "$as_me:3016: result: $CXX" >&5
  echo "${ECHO_T}$CXX" >&6
  else
 -  echo "$as_me:3091: result: no" >&5
-+  echo "$as_me:3197: result: no" >&5
++  echo "$as_me:3019: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
         fi
-        if test "$CXX" = "g++" ; then
+-       if test "$CXX" = "g++" ; then
 -               { echo "$as_me:3097: WARNING: ignoring hardcoded g++" >&5
-+               { echo "$as_me:3203: WARNING: ignoring hardcoded g++" >&5
- echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
+-echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
++       case "x$CXX" in #(vi
++       x|xg++)
++               { echo "$as_me:3026: 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="";
-        fi
-@@ -3102,11 +3208,11 @@
+-       fi
++               ;;
++       esac
+ fi
  
  GXX_VERSION=none
  if test "$GXX" = yes; then
 -       echo "$as_me:3105: checking version of g++" >&5
-+       echo "$as_me:3211: checking version of g++" >&5
- echo $ECHO_N "checking version of g++... $ECHO_C" >&6
+-echo $ECHO_N "checking version of g++... $ECHO_C" >&6
++       echo "$as_me:3035: 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.].*//'`"
         test -z "$GXX_VERSION" && GXX_VERSION=unknown
 -       echo "$as_me:3109: result: $GXX_VERSION" >&5
-+       echo "$as_me:3215: result: $GXX_VERSION" >&5
++       echo "$as_me:3039: result: $GXX_VERSION" >&5
  echo "${ECHO_T}$GXX_VERSION" >&6
  fi
  
-@@ -3114,12 +3220,12 @@
+@@ -3114,12 +3044,12 @@
  1*|2.[0-6]*)
         # GXX=""; CXX=""; ac_cv_prog_gxx=no
         # cf_cxx_library=no
 -       { echo "$as_me:3117: WARNING: templates do not work" >&5
-+       { echo "$as_me:3223: WARNING: templates do not work" >&5
++       { echo "$as_me:3047: WARNING: templates do not work" >&5
  echo "$as_me: WARNING: templates do not work" >&2;}
         ;;
@@ -13769 +16242 @@
  
 -echo "$as_me:3122: checking if you want to build C++ binding and demo" >&5
-+echo "$as_me:3228: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3052: 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.
-@@ -3129,10 +3235,10 @@
+@@ -3129,23 +3059,15 @@
  else
    cf_with_cxx_binding=$cf_with_cxx
  fi;
 -echo "$as_me:3132: result: $cf_with_cxx_binding" >&5
-+echo "$as_me:3238: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3062: result: $cf_with_cxx_binding" >&5
  echo "${ECHO_T}$cf_with_cxx_binding" >&6
  
 -echo "$as_me:3135: checking if you want to build with Ada95" >&5
-+echo "$as_me:3241: checking if you want to build with Ada95" >&5
++echo "$as_me:3065: checking if you want to build with Ada95" >&5
  echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
- 
- # Check whether --with-ada or --without-ada was given.
-@@ -3142,10 +3248,10 @@
- else
-   cf_with_ada=yes
- fi;
+-
+-# Check whether --with-ada or --without-ada was given.
+-if test "${with_ada+set}" = set; then
+-  withval="$with_ada"
+-  cf_with_ada=$withval
+-else
+-  cf_with_ada=yes
+-fi;
 -echo "$as_me:3145: result: $cf_with_ada" >&5
-+echo "$as_me:3251: result: $cf_with_ada" >&5
++echo "$as_me:3067: result: $cf_with_ada" >&5
  echo "${ECHO_T}$cf_with_ada" >&6
  
 -echo "$as_me:3148: checking if you want to install manpages" >&5
-+echo "$as_me:3254: checking if you want to install manpages" >&5
++echo "$as_me:3070: 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.
-@@ -3155,10 +3261,10 @@
+@@ -3155,10 +3077,10 @@
  else
    cf_with_manpages=yes
  fi;
 -echo "$as_me:3158: result: $cf_with_manpages" >&5
-+echo "$as_me:3264: result: $cf_with_manpages" >&5
++echo "$as_me:3080: result: $cf_with_manpages" >&5
  echo "${ECHO_T}$cf_with_manpages" >&6
  
 -echo "$as_me:3161: checking if you want to build programs such as tic" >&5
-+echo "$as_me:3267: checking if you want to build programs such as tic" >&5
++echo "$as_me:3083: 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.
-@@ -3168,10 +3274,10 @@
+@@ -3168,10 +3090,10 @@
  else
    cf_with_progs=yes
  fi;
 -echo "$as_me:3171: result: $cf_with_progs" >&5
-+echo "$as_me:3277: result: $cf_with_progs" >&5
++echo "$as_me:3093: result: $cf_with_progs" >&5
  echo "${ECHO_T}$cf_with_progs" >&6
  
 -echo "$as_me:3174: checking if you want to build test-programs" >&5
-+echo "$as_me:3280: checking if you want to build test-programs" >&5
++echo "$as_me:3096: 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.
-@@ -3181,10 +3287,10 @@
+@@ -3181,10 +3103,10 @@
  else
    cf_with_tests=yes
  fi;
 -echo "$as_me:3184: result: $cf_with_tests" >&5
-+echo "$as_me:3290: result: $cf_with_tests" >&5
++echo "$as_me:3106: result: $cf_with_tests" >&5
  echo "${ECHO_T}$cf_with_tests" >&6
  
 -echo "$as_me:3187: checking if you wish to install curses.h" >&5
-+echo "$as_me:3293: checking if you wish to install curses.h" >&5
++echo "$as_me:3109: 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.
-@@ -3194,7 +3300,7 @@
+@@ -3194,7 +3116,7 @@
  else
    with_curses_h=yes
  fi;
 -echo "$as_me:3197: result: $with_curses_h" >&5
-+echo "$as_me:3303: result: $with_curses_h" >&5
++echo "$as_me:3119: result: $with_curses_h" >&5
  echo "${ECHO_T}$with_curses_h" >&6
  
  modules_to_build="ncurses"
-@@ -3220,7 +3326,7 @@
+@@ -3220,7 +3142,7 @@
  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:3223: checking for $ac_word" >&5
-+echo "$as_me:3329: checking for $ac_word" >&5
++echo "$as_me:3145: 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
-@@ -3235,7 +3341,7 @@
+@@ -3235,7 +3157,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AWK="$ac_prog"
 -echo "$as_me:3238: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3344: found $ac_dir/$ac_word" >&5
++echo "$as_me:3160: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3243,21 +3349,21 @@
+@@ -3243,21 +3165,21 @@
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
 -  echo "$as_me:3246: result: $AWK" >&5
-+  echo "$as_me:3352: result: $AWK" >&5
++  echo "$as_me:3168: result: $AWK" >&5
  echo "${ECHO_T}$AWK" >&6
  else
 -  echo "$as_me:3249: result: no" >&5
-+  echo "$as_me:3355: result: no" >&5
++  echo "$as_me:3171: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -13882 +16357 @@
  
 -test -z "$AWK" && { { echo "$as_me:3256: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:3362: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3178: error: No awk program found" >&5
  echo "$as_me: error: No awk program found" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:3260: checking for egrep" >&5
-+echo "$as_me:3366: checking for egrep" >&5
++echo "$as_me:3182: 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
-@@ -3267,11 +3373,11 @@
+@@ -3267,11 +3189,11 @@
      else ac_cv_prog_egrep='egrep'
      fi
  fi
 -echo "$as_me:3270: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:3376: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3192: 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:3274: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:3380: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:3196: error: No egrep program found" >&5
  echo "$as_me: error: No egrep program found" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -3287,7 +3393,7 @@
+@@ -3287,7 +3209,7 @@
  # 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:3290: checking for a BSD compatible install" >&5
-+echo "$as_me:3396: checking for a BSD compatible install" >&5
++echo "$as_me:3212: 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
-@@ -3336,7 +3442,7 @@
+@@ -3336,7 +3258,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
 -echo "$as_me:3339: result: $INSTALL" >&5
-+echo "$as_me:3445: result: $INSTALL" >&5
++echo "$as_me:3261: result: $INSTALL" >&5
  echo "${ECHO_T}$INSTALL" >&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3361,7 +3467,7 @@
+@@ -3361,7 +3283,7 @@
  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:3364: checking for $ac_word" >&5
-+echo "$as_me:3470: checking for $ac_word" >&5
++echo "$as_me:3286: 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
-@@ -3376,7 +3482,7 @@
+@@ -3376,7 +3298,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_LINT="$ac_prog"
 -echo "$as_me:3379: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3485: found $ac_dir/$ac_word" >&5
++echo "$as_me:3301: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3384,28 +3490,28 @@
+@@ -3384,28 +3306,28 @@
  fi
  LINT=$ac_cv_prog_LINT
  if test -n "$LINT"; then
 -  echo "$as_me:3387: result: $LINT" >&5
-+  echo "$as_me:3493: result: $LINT" >&5
++  echo "$as_me:3309: result: $LINT" >&5
  echo "${ECHO_T}$LINT" >&6
  else
 -  echo "$as_me:3390: result: no" >&5
-+  echo "$as_me:3496: result: no" >&5
++  echo "$as_me:3312: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -13958 +16433 @@
  
 -echo "$as_me:3397: checking whether ln -s works" >&5
-+echo "$as_me:3503: checking whether ln -s works" >&5
++echo "$as_me:3319: 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 "$as_me:3401: result: yes" >&5
-+  echo "$as_me:3507: result: yes" >&5
++  echo "$as_me:3323: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:3404: result: no, using $LN_S" >&5
-+  echo "$as_me:3510: result: no, using $LN_S" >&5
++  echo "$as_me:3326: result: no, using $LN_S" >&5
  echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
 -echo "$as_me:3408: checking if $LN_S -f options work" >&5
-+echo "$as_me:3514: checking if $LN_S -f options work" >&5
++echo "$as_me:3330: 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
-@@ -3417,12 +3523,12 @@
+@@ -3417,12 +3339,12 @@
         cf_prog_ln_sf=no
  fi
  rm -f conf$$.dst conf$$src
 -echo "$as_me:3420: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:3526: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3342: result: $cf_prog_ln_sf" >&5
  echo "${ECHO_T}$cf_prog_ln_sf" >&6
  
@@ -13987 +16462 @@
  
 -echo "$as_me:3425: checking for long file names" >&5
-+echo "$as_me:3531: checking for long file names" >&5
++echo "$as_me:3347: 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
-@@ -3461,7 +3567,7 @@
+@@ -3461,7 +3383,7 @@
    rm -rf $ac_xdir 2>/dev/null
  done
  fi
 -echo "$as_me:3464: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:3570: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3386: result: $ac_cv_sys_long_file_names" >&5
  echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
  if test $ac_cv_sys_long_file_names = yes; then
  
-@@ -3473,7 +3579,7 @@
+@@ -3473,7 +3395,7 @@
  
  # if we find pkg-config, check if we should install the ".pc" files.
  
 -echo "$as_me:3476: checking if you want to use pkg-config" >&5
-+echo "$as_me:3582: checking if you want to use pkg-config" >&5
++echo "$as_me:3398: 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.
-@@ -3483,7 +3589,7 @@
+@@ -3483,7 +3405,7 @@
  else
    cf_pkg_config=yes
  fi;
 -echo "$as_me:3486: result: $cf_pkg_config" >&5
-+echo "$as_me:3592: result: $cf_pkg_config" >&5
++echo "$as_me:3408: result: $cf_pkg_config" >&5
  echo "${ECHO_T}$cf_pkg_config" >&6
  
  case $cf_pkg_config in #(vi
-@@ -3491,10 +3597,11 @@
+@@ -3491,10 +3413,11 @@
         PKG_CONFIG=none
         ;;
@@ -14028 +16503 @@
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 -echo "$as_me:3497: checking for $ac_word" >&5
-+echo "$as_me:3604: checking for $ac_word" >&5
++echo "$as_me:3420: 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
-@@ -3511,7 +3618,7 @@
+@@ -3511,7 +3434,7 @@
    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:3514: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3621: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3437: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -3522,10 +3629,10 @@
+@@ -3522,10 +3445,10 @@
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  
  if test -n "$PKG_CONFIG"; then
 -  echo "$as_me:3525: result: $PKG_CONFIG" >&5
-+  echo "$as_me:3632: result: $PKG_CONFIG" >&5
++  echo "$as_me:3448: result: $PKG_CONFIG" >&5
  echo "${ECHO_T}$PKG_CONFIG" >&6
  else
 -  echo "$as_me:3528: result: no" >&5
-+  echo "$as_me:3635: result: no" >&5
++  echo "$as_me:3451: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3534,7 +3641,7 @@
+@@ -3534,7 +3457,7 @@
    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:3537: checking for $ac_word" >&5
-+echo "$as_me:3644: checking for $ac_word" >&5
++echo "$as_me:3460: 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
-@@ -3551,7 +3658,7 @@
+@@ -3551,7 +3474,7 @@
    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:3554: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3661: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3477: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -3563,10 +3670,10 @@
+@@ -3563,10 +3486,10 @@
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  
  if test -n "$ac_pt_PKG_CONFIG"; then
 -  echo "$as_me:3566: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:3673: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3489: result: $ac_pt_PKG_CONFIG" >&5
  echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
  else
 -  echo "$as_me:3569: result: no" >&5
-+  echo "$as_me:3676: result: no" >&5
++  echo "$as_me:3492: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3609,7 +3716,7 @@
+@@ -3597,7 +3520,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval PKG_CONFIG="$PKG_CONFIG"
+   case ".$PKG_CONFIG" in #(vi
+   .NONE/*)
+@@ -3609,7 +3532,7 @@
    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:3612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+  { { echo "$as_me:3719: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:3535: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
  echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -3617,16 +3724,52 @@
+@@ -3617,16 +3540,51 @@
  
  fi
@@ -14102 +16586 @@
 -echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
 +if test "$PKG_CONFIG" != none ; then
-+       echo "$as_me:3728: checking for $PKG_CONFIG library directory" >&5
++       echo "$as_me:3544: checking for $PKG_CONFIG library directory" >&5
 +echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
  
@@ -14110 +16594 @@
 -       fi
 -       PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
 +# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
 +if test "${with_pkg_config_libdir+set}" = set; then
@@ -14144 +16629 @@
 +       esac
 +
-+       echo "$as_me:3765: result: $PKG_CONFIG_LIBDIR" >&5
++       echo "$as_me:3581: result: $PKG_CONFIG_LIBDIR" >&5
 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 +fi
 +
 +if test "$PKG_CONFIG" != none ; then
-        if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               echo "$as_me:3771: checking if we should install .pc files for $PKG_CONFIG" >&5
++       echo "$as_me:3586: 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
  
  # Check whether --enable-pc-files or --disable-pc-files was given.
  if test "${enable_pc_files+set}" = set; then
-@@ -3635,18 +3778,18 @@
+@@ -3635,18 +3593,48 @@
  else
    enable_pc_files=no
  fi;
 -               echo "$as_me:3638: result: $enable_pc_files" >&5
-+               echo "$as_me:3781: result: $enable_pc_files" >&5
++       echo "$as_me:3596: result: $enable_pc_files" >&5
  echo "${ECHO_T}$enable_pc_files" >&6
 -       else
@@ -14167 +16651 @@
 -               { echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
 -echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-                enable_pc_files=no
-+               { echo "$as_me:3785: WARNING: did not find $PKG_CONFIG library" >&5
-+echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;}
+-               enable_pc_files=no
++       if test "$enable_pc_files" != no
++       then
++
++if test "x$prefix" != xNONE; then
++  cf_path_syntax="$prefix"
++else
++  cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$PKG_CONFIG_LIBDIR" in #(vi
++.\$\(*\)*|.\'*\'*) #(vi
++  ;;
++..|./*|.\\*) #(vi
++  ;;
++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
++  ;;
++.\${*prefix}*|.\${*dir}*) #(vi
++  eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
++  case ".$PKG_CONFIG_LIBDIR" in #(vi
++  .NONE/*)
++    PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++    ;;
++  esac
++  ;; #(vi
++.no|.NONE/*)
++  PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++  ;;
++*)
++  { { echo "$as_me:3626: 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; }; }
++  ;;
++esac
++
         fi
 +else
@@ -14177 +16692 @@
  
 -echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3792: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3637: 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.
-@@ -3656,11 +3799,11 @@
+@@ -3656,11 +3644,11 @@
  else
    enable_mixedcase=auto
  fi;
 -echo "$as_me:3659: result: $enable_mixedcase" >&5
-+echo "$as_me:3802: result: $enable_mixedcase" >&5
++echo "$as_me:3647: result: $enable_mixedcase" >&5
  echo "${ECHO_T}$enable_mixedcase" >&6
  if test "$enable_mixedcase" = "auto" ; then
  
 -echo "$as_me:3663: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3806: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3651: 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
-@@ -3687,7 +3830,7 @@
+@@ -3687,7 +3675,7 @@
  fi
  
  fi
 -echo "$as_me:3690: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3833: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3678: result: $cf_cv_mixedcase" >&5
  echo "${ECHO_T}$cf_cv_mixedcase" >&6
  test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
  #define MIXEDCASE_FILENAMES 1
-@@ -3704,7 +3847,7 @@
+@@ -3704,7 +3692,7 @@
  fi
  
  # do this after mixed-case option (tags/TAGS is not as important as tic).
 -echo "$as_me:3707: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3850: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3695: 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
-@@ -3724,11 +3867,11 @@
+@@ -3724,11 +3712,11 @@
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:3727: result: yes" >&5
-+  echo "$as_me:3870: result: yes" >&5
++  echo "$as_me:3715: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    SET_MAKE=
  else
 -  echo "$as_me:3731: result: no" >&5
-+  echo "$as_me:3874: result: no" >&5
++  echo "$as_me:3719: result: no" >&5
  echo "${ECHO_T}no" >&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -3737,7 +3880,7 @@
+@@ -3737,7 +3725,7 @@
  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:3740: checking for $ac_word" >&5
-+echo "$as_me:3883: checking for $ac_word" >&5
++echo "$as_me:3728: 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
-@@ -3752,7 +3895,7 @@
+@@ -3752,7 +3740,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CTAGS="$ac_prog"
 -echo "$as_me:3755: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3898: found $ac_dir/$ac_word" >&5
++echo "$as_me:3743: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3760,10 +3903,10 @@
+@@ -3760,10 +3748,10 @@
  fi
  CTAGS=$ac_cv_prog_CTAGS
  if test -n "$CTAGS"; then
 -  echo "$as_me:3763: result: $CTAGS" >&5
-+  echo "$as_me:3906: result: $CTAGS" >&5
++  echo "$as_me:3751: result: $CTAGS" >&5
  echo "${ECHO_T}$CTAGS" >&6
  else
 -  echo "$as_me:3766: result: no" >&5
-+  echo "$as_me:3909: result: no" >&5
++  echo "$as_me:3754: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3774,7 +3917,7 @@
+@@ -3774,7 +3762,7 @@
  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:3777: checking for $ac_word" >&5
-+echo "$as_me:3920: checking for $ac_word" >&5
++echo "$as_me:3765: 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
-@@ -3789,7 +3932,7 @@
+@@ -3789,7 +3777,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ETAGS="$ac_prog"
 -echo "$as_me:3792: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3935: found $ac_dir/$ac_word" >&5
++echo "$as_me:3780: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3797,10 +3940,10 @@
+@@ -3797,10 +3785,10 @@
  fi
  ETAGS=$ac_cv_prog_ETAGS
  if test -n "$ETAGS"; then
 -  echo "$as_me:3800: result: $ETAGS" >&5
-+  echo "$as_me:3943: result: $ETAGS" >&5
++  echo "$as_me:3788: result: $ETAGS" >&5
  echo "${ECHO_T}$ETAGS" >&6
  else
 -  echo "$as_me:3803: result: no" >&5
-+  echo "$as_me:3946: result: no" >&5
++  echo "$as_me:3791: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3809,7 +3952,7 @@
+@@ -3809,7 +3797,7 @@
  
  # 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:3812: checking for $ac_word" >&5
-+echo "$as_me:3955: checking for $ac_word" >&5
++echo "$as_me:3800: 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
-@@ -3824,7 +3967,7 @@
+@@ -3824,7 +3812,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_LOWER_TAGS="yes"
 -echo "$as_me:3827: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3970: found $ac_dir/$ac_word" >&5
++echo "$as_me:3815: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3833,17 +3976,17 @@
+@@ -3833,17 +3821,17 @@
  fi
  MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
  if test -n "$MAKE_LOWER_TAGS"; then
 -  echo "$as_me:3836: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3979: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3824: result: $MAKE_LOWER_TAGS" >&5
  echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
  else
 -  echo "$as_me:3839: result: no" >&5
-+  echo "$as_me:3982: result: no" >&5
++  echo "$as_me:3827: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -14324 +16839 @@
  set dummy ${ETAGS:-etags}; ac_word=$2
 -echo "$as_me:3846: checking for $ac_word" >&5
-+echo "$as_me:3989: checking for $ac_word" >&5
++echo "$as_me:3834: 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
-@@ -3858,7 +4001,7 @@
+@@ -3858,7 +3846,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_UPPER_TAGS="yes"
 -echo "$as_me:3861: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4004: found $ac_dir/$ac_word" >&5
++echo "$as_me:3849: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3867,10 +4010,10 @@
+@@ -3867,10 +3855,10 @@
  fi
  MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
  if test -n "$MAKE_UPPER_TAGS"; then
 -  echo "$as_me:3870: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:4013: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3858: result: $MAKE_UPPER_TAGS" >&5
  echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
  else
 -  echo "$as_me:3873: result: no" >&5
-+  echo "$as_me:4016: result: no" >&5
++  echo "$as_me:3861: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3890,7 +4033,7 @@
+@@ -3890,7 +3878,7 @@
         MAKE_LOWER_TAGS="#"
  fi
  
 -echo "$as_me:3893: checking for makeflags variable" >&5
-+echo "$as_me:4036: checking for makeflags variable" >&5
++echo "$as_me:3881: 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
-@@ -3924,13 +4067,13 @@
+@@ -3924,13 +3912,13 @@
         rm -f cf_makeflags.tmp
  
  fi
 -echo "$as_me:3927: result: $cf_cv_makeflags" >&5
-+echo "$as_me:4070: result: $cf_cv_makeflags" >&5
++echo "$as_me:3915: result: $cf_cv_makeflags" >&5
  echo "${ECHO_T}$cf_cv_makeflags" >&6
  
@@ -14371 +16886 @@
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 -echo "$as_me:3933: checking for $ac_word" >&5
-+echo "$as_me:4076: checking for $ac_word" >&5
++echo "$as_me:3921: 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
-@@ -3945,7 +4088,7 @@
+@@ -3945,7 +3933,7 @@
    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:3948: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4091: found $ac_dir/$ac_word" >&5
++echo "$as_me:3936: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3953,10 +4096,10 @@
+@@ -3953,10 +3941,10 @@
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
 -  echo "$as_me:3956: result: $RANLIB" >&5
-+  echo "$as_me:4099: result: $RANLIB" >&5
++  echo "$as_me:3944: result: $RANLIB" >&5
  echo "${ECHO_T}$RANLIB" >&6
  else
 -  echo "$as_me:3959: result: no" >&5
-+  echo "$as_me:4102: result: no" >&5
++  echo "$as_me:3947: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3965,7 +4108,7 @@
+@@ -3965,7 +3953,7 @@
    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:3968: checking for $ac_word" >&5
-+echo "$as_me:4111: checking for $ac_word" >&5
++echo "$as_me:3956: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3980,7 +4123,7 @@
+@@ -3980,7 +3968,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_RANLIB="ranlib"
 -echo "$as_me:3983: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4126: found $ac_dir/$ac_word" >&5
++echo "$as_me:3971: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3989,10 +4132,10 @@
+@@ -3989,10 +3977,10 @@
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:3992: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:4135: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3980: result: $ac_ct_RANLIB" >&5
  echo "${ECHO_T}$ac_ct_RANLIB" >&6
  else
 -  echo "$as_me:3995: result: no" >&5
-+  echo "$as_me:4138: result: no" >&5
++  echo "$as_me:3983: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4004,7 +4147,7 @@
+@@ -4004,7 +3992,7 @@
  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:4007: checking for $ac_word" >&5
-+echo "$as_me:4150: checking for $ac_word" >&5
++echo "$as_me:3995: 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
-@@ -4019,7 +4162,7 @@
+@@ -4019,7 +4007,7 @@
    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:4022: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4165: found $ac_dir/$ac_word" >&5
++echo "$as_me:4010: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4027,10 +4170,10 @@
+@@ -4027,10 +4015,10 @@
  fi
  LD=$ac_cv_prog_LD
  if test -n "$LD"; then
 -  echo "$as_me:4030: result: $LD" >&5
-+  echo "$as_me:4173: result: $LD" >&5
++  echo "$as_me:4018: result: $LD" >&5
  echo "${ECHO_T}$LD" >&6
  else
 -  echo "$as_me:4033: result: no" >&5
-+  echo "$as_me:4176: result: no" >&5
++  echo "$as_me:4021: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4039,7 +4182,7 @@
+@@ -4039,7 +4027,7 @@
    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:4042: checking for $ac_word" >&5
-+echo "$as_me:4185: checking for $ac_word" >&5
++echo "$as_me:4030: 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
-@@ -4054,7 +4197,7 @@
+@@ -4054,7 +4042,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_LD="ld"
 -echo "$as_me:4057: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4200: found $ac_dir/$ac_word" >&5
++echo "$as_me:4045: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4063,10 +4206,10 @@
+@@ -4063,10 +4051,10 @@
  fi
  ac_ct_LD=$ac_cv_prog_ac_ct_LD
  if test -n "$ac_ct_LD"; then
 -  echo "$as_me:4066: result: $ac_ct_LD" >&5
-+  echo "$as_me:4209: result: $ac_ct_LD" >&5
++  echo "$as_me:4054: result: $ac_ct_LD" >&5
  echo "${ECHO_T}$ac_ct_LD" >&6
  else
 -  echo "$as_me:4069: result: no" >&5
-+  echo "$as_me:4212: result: no" >&5
++  echo "$as_me:4057: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4078,7 +4221,7 @@
+@@ -4078,7 +4066,7 @@
  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:4081: checking for $ac_word" >&5
-+echo "$as_me:4224: checking for $ac_word" >&5
++echo "$as_me:4069: 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
-@@ -4093,7 +4236,7 @@
+@@ -4093,7 +4081,7 @@
    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:4096: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4239: found $ac_dir/$ac_word" >&5
++echo "$as_me:4084: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4101,10 +4244,10 @@
+@@ -4101,10 +4089,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:4104: result: $AR" >&5
-+  echo "$as_me:4247: result: $AR" >&5
++  echo "$as_me:4092: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:4107: result: no" >&5
-+  echo "$as_me:4250: result: no" >&5
++  echo "$as_me:4095: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4113,7 +4256,7 @@
+@@ -4113,7 +4101,7 @@
    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:4116: checking for $ac_word" >&5
-+echo "$as_me:4259: checking for $ac_word" >&5
++echo "$as_me:4104: 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
-@@ -4128,7 +4271,7 @@
+@@ -4128,7 +4116,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:4131: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4274: found $ac_dir/$ac_word" >&5
++echo "$as_me:4119: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4137,10 +4280,10 @@
+@@ -4137,10 +4125,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:4140: result: $ac_ct_AR" >&5
-+  echo "$as_me:4283: result: $ac_ct_AR" >&5
++  echo "$as_me:4128: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:4143: result: no" >&5
-+  echo "$as_me:4286: result: no" >&5
++  echo "$as_me:4131: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4152,7 +4295,7 @@
+@@ -4152,7 +4140,7 @@
  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:4155: checking for $ac_word" >&5
-+echo "$as_me:4298: checking for $ac_word" >&5
++echo "$as_me:4143: 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
-@@ -4167,7 +4310,7 @@
+@@ -4167,7 +4155,7 @@
    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:4170: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4313: found $ac_dir/$ac_word" >&5
++echo "$as_me:4158: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4175,10 +4318,10 @@
+@@ -4175,10 +4163,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:4178: result: $AR" >&5
-+  echo "$as_me:4321: result: $AR" >&5
++  echo "$as_me:4166: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:4181: result: no" >&5
-+  echo "$as_me:4324: result: no" >&5
++  echo "$as_me:4169: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4187,7 +4330,7 @@
+@@ -4187,7 +4175,7 @@
    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:4190: checking for $ac_word" >&5
-+echo "$as_me:4333: checking for $ac_word" >&5
++echo "$as_me:4178: 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
-@@ -4202,7 +4345,7 @@
+@@ -4202,7 +4190,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:4205: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4348: found $ac_dir/$ac_word" >&5
++echo "$as_me:4193: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4211,10 +4354,10 @@
+@@ -4211,10 +4199,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:4214: result: $ac_ct_AR" >&5
-+  echo "$as_me:4357: result: $ac_ct_AR" >&5
++  echo "$as_me:4202: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:4217: result: no" >&5
-+  echo "$as_me:4360: result: no" >&5
++  echo "$as_me:4205: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4223,7 +4366,7 @@
+@@ -4223,7 +4211,7 @@
    AR="$ac_cv_prog_AR"
  fi
  
 -echo "$as_me:4226: checking for options to update archives" >&5
-+echo "$as_me:4369: checking for options to update archives" >&5
++echo "$as_me:4214: 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
-@@ -4246,13 +4389,13 @@
+@@ -4246,13 +4234,13 @@
                 rm -f conftest.a
  
                 cat >conftest.$ac_ext <<EOF
 -#line 4249 "configure"
-+#line 4392 "configure"
++#line 4237 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -               if { (eval echo "$as_me:4252: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:4395: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:4240: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4255: \$? = $ac_status" >&5
-+  echo "$as_me:4398: \$? = $ac_status" >&5
++  echo "$as_me:4243: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                         $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -4263,7 +4406,7 @@
+@@ -4263,7 +4251,7 @@
                 else
                         test -n "$verbose" && echo "    cannot compile test-program" 1>&6
  
 -echo "${as_me:-configure}:4266: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:4409: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4254: testing cannot compile test-program ..." 1>&5
  
                         break
                 fi
-@@ -4271,7 +4414,7 @@
+@@ -4271,7 +4259,7 @@
         rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
  
  fi
 -echo "$as_me:4274: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:4417: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4262: result: $cf_cv_ar_flags" >&5
  echo "${ECHO_T}$cf_cv_ar_flags" >&6
  
  if test -n "$ARFLAGS" ; then
-@@ -4282,7 +4425,7 @@
+@@ -4282,7 +4270,7 @@
         ARFLAGS=$cf_cv_ar_flags
  fi
  
 -echo "$as_me:4285: checking if you have specified an install-prefix" >&5
-+echo "$as_me:4428: checking if you have specified an install-prefix" >&5
++echo "$as_me:4273: 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.
-@@ -4295,7 +4438,7 @@
+@@ -4295,7 +4283,7 @@
                 ;;
         esac
  fi;
 -echo "$as_me:4298: result: $DESTDIR" >&5
-+echo "$as_me:4441: result: $DESTDIR" >&5
++echo "$as_me:4286: result: $DESTDIR" >&5
  echo "${ECHO_T}$DESTDIR" >&6
  
  ###############################################################################
-@@ -4323,7 +4466,7 @@
+@@ -4323,7 +4311,7 @@
  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:4326: checking for $ac_word" >&5
-+echo "$as_me:4469: checking for $ac_word" >&5
++echo "$as_me:4314: 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
-@@ -4338,7 +4481,7 @@
+@@ -4338,7 +4326,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_BUILD_CC="$ac_prog"
 -echo "$as_me:4341: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4484: found $ac_dir/$ac_word" >&5
++echo "$as_me:4329: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4346,10 +4489,10 @@
+@@ -4346,10 +4334,10 @@
  fi
  BUILD_CC=$ac_cv_prog_BUILD_CC
  if test -n "$BUILD_CC"; then
 -  echo "$as_me:4349: result: $BUILD_CC" >&5
-+  echo "$as_me:4492: result: $BUILD_CC" >&5
++  echo "$as_me:4337: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  else
 -  echo "$as_me:4352: result: no" >&5
-+  echo "$as_me:4495: result: no" >&5
++  echo "$as_me:4340: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4357,12 +4500,12 @@
+@@ -4357,12 +4345,12 @@
  done
  
  fi;
 -       echo "$as_me:4360: checking for native build C compiler" >&5
-+       echo "$as_me:4503: checking for native build C compiler" >&5
++       echo "$as_me:4348: checking for native build C compiler" >&5
  echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
 -       echo "$as_me:4362: result: $BUILD_CC" >&5
-+       echo "$as_me:4505: result: $BUILD_CC" >&5
++       echo "$as_me:4350: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  
 -       echo "$as_me:4365: checking for native build C preprocessor" >&5
-+       echo "$as_me:4508: checking for native build C preprocessor" >&5
++       echo "$as_me:4353: 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.
-@@ -4372,10 +4515,10 @@
+@@ -4372,10 +4360,10 @@
  else
    BUILD_CPP='${BUILD_CC} -E'
  fi;
 -       echo "$as_me:4375: result: $BUILD_CPP" >&5
-+       echo "$as_me:4518: result: $BUILD_CPP" >&5
++       echo "$as_me:4363: result: $BUILD_CPP" >&5
  echo "${ECHO_T}$BUILD_CPP" >&6
  
 -       echo "$as_me:4378: checking for native build C flags" >&5
-+       echo "$as_me:4521: checking for native build C flags" >&5
++       echo "$as_me:4366: 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.
-@@ -4383,10 +4526,10 @@
+@@ -4383,10 +4371,10 @@
    withval="$with_build_cflags"
    BUILD_CFLAGS="$withval"
  fi;
 -       echo "$as_me:4386: result: $BUILD_CFLAGS" >&5
-+       echo "$as_me:4529: result: $BUILD_CFLAGS" >&5
++       echo "$as_me:4374: result: $BUILD_CFLAGS" >&5
  echo "${ECHO_T}$BUILD_CFLAGS" >&6
  
 -       echo "$as_me:4389: checking for native build C preprocessor-flags" >&5
-+       echo "$as_me:4532: checking for native build C preprocessor-flags" >&5
++       echo "$as_me:4377: 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.
-@@ -4394,10 +4537,10 @@
+@@ -4394,10 +4382,10 @@
    withval="$with_build_cppflags"
    BUILD_CPPFLAGS="$withval"
  fi;
 -       echo "$as_me:4397: result: $BUILD_CPPFLAGS" >&5
-+       echo "$as_me:4540: result: $BUILD_CPPFLAGS" >&5
++       echo "$as_me:4385: result: $BUILD_CPPFLAGS" >&5
  echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
  
 -       echo "$as_me:4400: checking for native build linker-flags" >&5
-+       echo "$as_me:4543: checking for native build linker-flags" >&5
++       echo "$as_me:4388: 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.
-@@ -4405,10 +4548,10 @@
+@@ -4405,10 +4393,10 @@
    withval="$with_build_ldflags"
    BUILD_LDFLAGS="$withval"
  fi;
 -       echo "$as_me:4408: result: $BUILD_LDFLAGS" >&5
-+       echo "$as_me:4551: result: $BUILD_LDFLAGS" >&5
++       echo "$as_me:4396: result: $BUILD_LDFLAGS" >&5
  echo "${ECHO_T}$BUILD_LDFLAGS" >&6
  
 -       echo "$as_me:4411: checking for native build linker-libraries" >&5
-+       echo "$as_me:4554: checking for native build linker-libraries" >&5
++       echo "$as_me:4399: 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.
-@@ -4416,7 +4559,7 @@
+@@ -4416,7 +4404,7 @@
    withval="$with_build_libs"
    BUILD_LIBS="$withval"
  fi;
 -       echo "$as_me:4419: result: $BUILD_LIBS" >&5
-+       echo "$as_me:4562: result: $BUILD_LIBS" >&5
++       echo "$as_me:4407: result: $BUILD_LIBS" >&5
  echo "${ECHO_T}$BUILD_LIBS" >&6
  
         # this assumes we're on Unix.
-@@ -4426,7 +4569,7 @@
+@@ -4426,7 +4414,7 @@
         : ${BUILD_CC:='${CC}'}
  
         if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
 -               { { echo "$as_me:4429: error: Cross-build requires two compilers.
-+               { { echo "$as_me:4572: error: Cross-build requires two compilers.
++               { { echo "$as_me:4417: 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;}
-@@ -4451,7 +4594,7 @@
+@@ -4451,7 +4439,7 @@
  ### shared, for example.
  cf_list_models=""
  
 -echo "$as_me:4454: checking if libtool -version-number should be used" >&5
-+echo "$as_me:4597: checking if libtool -version-number should be used" >&5
++echo "$as_me:4442: 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.
-@@ -4468,7 +4611,7 @@
+@@ -4468,7 +4456,7 @@
    cf_libtool_version=yes
  
  fi;
 -echo "$as_me:4471: result: $cf_libtool_version" >&5
-+echo "$as_me:4614: result: $cf_libtool_version" >&5
++echo "$as_me:4459: result: $cf_libtool_version" >&5
  echo "${ECHO_T}$cf_libtool_version" >&6
  
  if test "$cf_libtool_version" = yes ; then
-@@ -4493,7 +4636,7 @@
+@@ -4493,7 +4481,7 @@
  LIB_INSTALL=
  LIB_UNINSTALL=
  
 -echo "$as_me:4496: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4639: checking if you want to build libraries with libtool" >&5
++echo "$as_me:4484: 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.
-@@ -4503,7 +4646,7 @@
+@@ -4503,7 +4491,7 @@
  else
    with_libtool=no
  fi;
 -echo "$as_me:4506: result: $with_libtool" >&5
-+echo "$as_me:4649: result: $with_libtool" >&5
++echo "$as_me:4494: result: $with_libtool" >&5
  echo "${ECHO_T}$with_libtool" >&6
  if test "$with_libtool" != "no"; then
  
-@@ -4534,7 +4677,7 @@
+@@ -4522,7 +4510,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval with_libtool="$with_libtool"
+   case ".$with_libtool" in #(vi
+   .NONE/*)
+@@ -4534,7 +4522,7 @@
    with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:4537: error: expected a pathname, not \"$with_libtool\"" >&5
-+  { { echo "$as_me:4680: error: expected a pathname, not \"$with_libtool\"" >&5
++  { { echo "$as_me:4525: error: expected a pathname, not \"$with_libtool\"" >&5
  echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -4544,7 +4687,7 @@
+@@ -4544,7 +4532,7 @@
         else
                 # Extract the first word of "libtool", so it can be a program name with args.
  set dummy libtool; ac_word=$2
 -echo "$as_me:4547: checking for $ac_word" >&5
-+echo "$as_me:4690: checking for $ac_word" >&5
++echo "$as_me:4535: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_LIBTOOL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4561,7 +4704,7 @@
+@@ -4561,7 +4549,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
 -   echo "$as_me:4564: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4707: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4552: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -4572,20 +4715,20 @@
+@@ -4572,20 +4560,20 @@
  LIBTOOL=$ac_cv_path_LIBTOOL
  
  if test -n "$LIBTOOL"; then
 -  echo "$as_me:4575: result: $LIBTOOL" >&5
-+  echo "$as_me:4718: result: $LIBTOOL" >&5
++  echo "$as_me:4563: result: $LIBTOOL" >&5
  echo "${ECHO_T}$LIBTOOL" >&6
  else
 -  echo "$as_me:4578: result: no" >&5
-+  echo "$as_me:4721: result: no" >&5
++  echo "$as_me:4566: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -14872 +17396 @@
         if test -z "$LIBTOOL" ; then
 -               { { echo "$as_me:4584: error: Cannot find libtool" >&5
-+               { { echo "$as_me:4727: error: Cannot find libtool" >&5
++               { { echo "$as_me:4572: error: Cannot find libtool" >&5
  echo "$as_me: error: Cannot find libtool" >&2;}
     { (exit 1); exit 1; }; }
@@ -14881 +17405 @@
         LIB_SUFFIX=.la
         LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -4596,17 +4739,17 @@
+@@ -4596,17 +4584,17 @@
         LIB_PREP=:
  
         # Show the version of libtool
 -       echo "$as_me:4599: checking version of libtool" >&5
-+       echo "$as_me:4742: checking version of libtool" >&5
++       echo "$as_me:4587: checking version of libtool" >&5
  echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
  
@@ -14894 +17418 @@
         cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
 -       echo "$as_me:4606: result: $cf_cv_libtool_version" >&5
-+       echo "$as_me:4749: result: $cf_cv_libtool_version" >&5
++       echo "$as_me:4594: result: $cf_cv_libtool_version" >&5
  echo "${ECHO_T}$cf_cv_libtool_version" >&6
         if test -z "$cf_cv_libtool_version" ; then
 -               { { echo "$as_me:4609: error: This is not GNU libtool" >&5
-+               { { echo "$as_me:4752: error: This is not GNU libtool" >&5
++               { { echo "$as_me:4597: error: This is not GNU libtool" >&5
  echo "$as_me: error: This is not GNU libtool" >&2;}
     { (exit 1); exit 1; }; }
         fi
-@@ -4614,7 +4757,7 @@
+@@ -4614,7 +4602,7 @@
         # special hack to add -no-undefined (which libtool should do for itself)
         LT_UNDEF=
@@ -14911 +17435 @@
                 ;;
         esac
-@@ -4642,7 +4785,7 @@
+@@ -4642,7 +4630,7 @@
  
  else
  
 -echo "$as_me:4645: checking if you want to build shared libraries" >&5
-+echo "$as_me:4788: checking if you want to build shared libraries" >&5
++echo "$as_me:4633: 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.
-@@ -4652,11 +4795,11 @@
+@@ -4652,11 +4640,11 @@
  else
    with_shared=no
  fi;
 -echo "$as_me:4655: result: $with_shared" >&5
-+echo "$as_me:4798: result: $with_shared" >&5
++echo "$as_me:4643: result: $with_shared" >&5
  echo "${ECHO_T}$with_shared" >&6
  test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
  
 -echo "$as_me:4659: checking if you want to build static libraries" >&5
-+echo "$as_me:4802: checking if you want to build static libraries" >&5
++echo "$as_me:4647: 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.
-@@ -4666,11 +4809,11 @@
+@@ -4666,11 +4654,11 @@
  else
    with_normal=yes
  fi;
 -echo "$as_me:4669: result: $with_normal" >&5
-+echo "$as_me:4812: result: $with_normal" >&5
++echo "$as_me:4657: result: $with_normal" >&5
  echo "${ECHO_T}$with_normal" >&6
  test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
  
 -echo "$as_me:4673: checking if you want to build debug libraries" >&5
-+echo "$as_me:4816: checking if you want to build debug libraries" >&5
++echo "$as_me:4661: 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.
-@@ -4680,11 +4823,11 @@
+@@ -4680,11 +4668,11 @@
  else
    with_debug=yes
  fi;
 -echo "$as_me:4683: result: $with_debug" >&5
-+echo "$as_me:4826: result: $with_debug" >&5
++echo "$as_me:4671: result: $with_debug" >&5
  echo "${ECHO_T}$with_debug" >&6
  test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
  
 -echo "$as_me:4687: checking if you want to build profiling libraries" >&5
-+echo "$as_me:4830: checking if you want to build profiling libraries" >&5
++echo "$as_me:4675: 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.
-@@ -4694,7 +4837,7 @@
+@@ -4694,7 +4682,7 @@
  else
    with_profile=no
  fi;
 -echo "$as_me:4697: result: $with_profile" >&5
-+echo "$as_me:4840: result: $with_profile" >&5
++echo "$as_me:4685: result: $with_profile" >&5
  echo "${ECHO_T}$with_profile" >&6
  test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
  
-@@ -4702,19 +4845,19 @@
+@@ -4702,19 +4690,19 @@
  
  ###############################################################################
  
 -echo "$as_me:4705: checking for specified models" >&5
-+echo "$as_me:4848: checking for specified models" >&5
++echo "$as_me:4693: 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 "$as_me:4709: result: $cf_list_models" >&5
-+echo "$as_me:4852: result: $cf_list_models" >&5
++echo "$as_me:4697: result: $cf_list_models" >&5
  echo "${ECHO_T}$cf_list_models" >&6
  
@@ -14987 +17511 @@
  ### up test-applications.
 -echo "$as_me:4714: checking for default model" >&5
-+echo "$as_me:4857: checking for default model" >&5
++echo "$as_me:4702: 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 "$as_me:4717: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:4860: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4705: result: $DFT_LWR_MODEL" >&5
  echo "${ECHO_T}$DFT_LWR_MODEL" >&6
  
  DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -4728,6 +4871,22 @@
+@@ -4728,6 +4716,22 @@
  LIB_DIR=../lib
  LIB_2ND=../../lib
  
-+echo "$as_me:4874: checking if you want to have a library-prefix" >&5
++echo "$as_me:4719: 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
 +
@@ -15009 +17533 @@
 +  with_lib_prefix=auto
 +fi;
-+echo "$as_me:4884: result: $with_lib_prefix" >&5
++echo "$as_me:4729: result: $with_lib_prefix" >&5
 +echo "${ECHO_T}$with_lib_prefix" >&6
 +
@@ -15018 +17542 @@
         OS/2*|os2*) #(vi
          LIB_PREFIX=''
-@@ -4737,13 +4896,18 @@
+@@ -4737,13 +4741,18 @@
         esac
  cf_prefix=$LIB_PREFIX
@@ -15035 +17559 @@
  
 -echo "$as_me:4746: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:4910: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:4755: 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.
-@@ -4753,10 +4917,10 @@
+@@ -4753,10 +4762,10 @@
  else
    with_termlib=no
  fi;
 -echo "$as_me:4756: result: $with_termlib" >&5
-+echo "$as_me:4920: result: $with_termlib" >&5
++echo "$as_me:4765: result: $with_termlib" >&5
  echo "${ECHO_T}$with_termlib" >&6
  
 -echo "$as_me:4759: checking if you want to build a separate tic library" >&5
-+echo "$as_me:4923: checking if you want to build a separate tic library" >&5
++echo "$as_me:4768: 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.
-@@ -4766,13 +4930,13 @@
+@@ -4766,13 +4775,13 @@
  else
    with_ticlib=no
  fi;
 -echo "$as_me:4769: result: $with_ticlib" >&5
-+echo "$as_me:4933: result: $with_ticlib" >&5
++echo "$as_me:4778: result: $with_ticlib" >&5
  echo "${ECHO_T}$with_ticlib" >&6
  
@@ -15064 +17588 @@
  
 -echo "$as_me:4775: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:4939: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:4784: 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.
-@@ -4782,27 +4946,27 @@
+@@ -4782,27 +4791,27 @@
  else
    with_gpm=maybe
  fi;
 -echo "$as_me:4785: result: $with_gpm" >&5
-+echo "$as_me:4949: result: $with_gpm" >&5
++echo "$as_me:4794: result: $with_gpm" >&5
  echo "${ECHO_T}$with_gpm" >&6
  
  if test "$with_gpm" != no ; then
 -       echo "$as_me:4789: checking for gpm.h" >&5
-+       echo "$as_me:4953: checking for gpm.h" >&5
++       echo "$as_me:4798: 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
@@ -15085 +17609 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4795 "configure"
-+#line 4959 "configure"
++#line 4804 "configure"
  #include "confdefs.h"
  #include <gpm.h>
  _ACEOF
 -if { (eval echo "$as_me:4799: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4963: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4808: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -15097 +17621 @@
    cat conftest.err >&5
 -  echo "$as_me:4805: \$? = $ac_status" >&5
-+  echo "$as_me:4969: \$? = $ac_status" >&5
++  echo "$as_me:4814: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4821,7 +4985,7 @@
+@@ -4821,7 +4830,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4824: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:4988: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:4833: result: $ac_cv_header_gpm_h" >&5
  echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
  if test $ac_cv_header_gpm_h = yes; then
  
-@@ -4832,14 +4996,14 @@
+@@ -4832,14 +4841,14 @@
                 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}:4835: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:4999: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:4844: testing assuming we really have GPM library ..." 1>&5
  
                         cat >>confdefs.h <<\EOF
@@ -15123 +17647 @@
                 else
 -                       echo "$as_me:4842: checking for Gpm_Open in -lgpm" >&5
-+                       echo "$as_me:5006: checking for Gpm_Open in -lgpm" >&5
++                       echo "$as_me:4851: 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
-@@ -4847,7 +5011,7 @@
+@@ -4847,7 +4856,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4850 "configure"
-+#line 5014 "configure"
++#line 4859 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4866,16 +5030,16 @@
+@@ -4866,16 +4875,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4869: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4878: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4872: \$? = $ac_status" >&5
-+  echo "$as_me:5036: \$? = $ac_status" >&5
++  echo "$as_me:4881: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4875: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4878: \$? = $ac_status" >&5
-+  echo "$as_me:5042: \$? = $ac_status" >&5
++  echo "$as_me:4887: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -4886,13 +5050,13 @@
+@@ -4886,13 +4895,13 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:4889: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5053: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:4898: result: $ac_cv_lib_gpm_Gpm_Open" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
  if test $ac_cv_lib_gpm_Gpm_Open = yes; then
@@ -15169 +17693 @@
  
 -                               { { echo "$as_me:4895: error: Cannot link with GPM library" >&5
-+                               { { echo "$as_me:5059: error: Cannot link with GPM library" >&5
++                               { { echo "$as_me:4904: error: Cannot link with GPM library" >&5
  echo "$as_me: error: Cannot link with GPM library" >&2;}
     { (exit 1); exit 1; }; }
                 fi
-@@ -4902,7 +5066,7 @@
+@@ -4902,7 +4911,7 @@
  
  else
  
 -               test "$with_gpm" != maybe && { echo "$as_me:4905: WARNING: Cannot find GPM header" >&5
-+               test "$with_gpm" != maybe && { echo "$as_me:5069: WARNING: Cannot find GPM header" >&5
++               test "$with_gpm" != maybe && { echo "$as_me:4914: WARNING: Cannot find GPM header" >&5
  echo "$as_me: WARNING: Cannot find GPM header" >&2;}
                 with_gpm=no
  
-@@ -4911,7 +5075,7 @@
+@@ -4911,7 +4920,7 @@
  fi
  
  if test "$with_gpm" != no ; then
 -       echo "$as_me:4914: checking if you want to load GPM dynamically" >&5
-+       echo "$as_me:5078: checking if you want to load GPM dynamically" >&5
++       echo "$as_me:4923: 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.
-@@ -4921,18 +5085,18 @@
+@@ -4921,18 +4930,18 @@
  else
    with_dlsym=yes
  fi;
 -       echo "$as_me:4924: result: $with_dlsym" >&5
-+       echo "$as_me:5088: result: $with_dlsym" >&5
++       echo "$as_me:4933: result: $with_dlsym" >&5
  echo "${ECHO_T}$with_dlsym" >&6
         if test "$with_dlsym" = yes ; then
@@ -15202 +17726 @@
  cf_have_dlsym=no
 -echo "$as_me:4929: checking for dlsym" >&5
-+echo "$as_me:5093: checking for dlsym" >&5
++echo "$as_me:4938: checking for dlsym" >&5
  echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
  if test "${ac_cv_func_dlsym+set}" = set; then
@@ -15209 +17733 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4935 "configure"
-+#line 5099 "configure"
++#line 4944 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dlsym (); below.  */
-@@ -4963,16 +5127,16 @@
+@@ -4955,7 +4964,7 @@
+ #if defined (__stub_dlsym) || defined (__stub___dlsym)
+ choke me
+ #else
+-f = dlsym;
++f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -4963,16 +4972,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4966: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4975: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4969: \$? = $ac_status" >&5
-+  echo "$as_me:5133: \$? = $ac_status" >&5
++  echo "$as_me:4978: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4972: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4981: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4975: \$? = $ac_status" >&5
-+  echo "$as_me:5139: \$? = $ac_status" >&5
++  echo "$as_me:4984: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_dlsym=yes
  else
-@@ -4982,14 +5146,14 @@
+@@ -4982,14 +4991,14 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4985: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5149: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:4994: result: $ac_cv_func_dlsym" >&5
  echo "${ECHO_T}$ac_cv_func_dlsym" >&6
  if test $ac_cv_func_dlsym = yes; then
@@ -15247 +17780 @@
  cf_have_libdl=no
 -echo "$as_me:4992: checking for dlsym in -ldl" >&5
-+echo "$as_me:5156: checking for dlsym in -ldl" >&5
++echo "$as_me:5001: 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
-@@ -4997,7 +5161,7 @@
+@@ -4997,7 +5006,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5000 "configure"
-+#line 5164 "configure"
++#line 5009 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5016,16 +5180,16 @@
+@@ -5016,16 +5025,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5019: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5028: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5022: \$? = $ac_status" >&5
-+  echo "$as_me:5186: \$? = $ac_status" >&5
++  echo "$as_me:5031: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5034: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5028: \$? = $ac_status" >&5
-+  echo "$as_me:5192: \$? = $ac_status" >&5
++  echo "$as_me:5037: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dl_dlsym=yes
  else
-@@ -5036,7 +5200,7 @@
+@@ -5036,7 +5045,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5039: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5203: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:5048: result: $ac_cv_lib_dl_dlsym" >&5
  echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
  if test $ac_cv_lib_dl_dlsym = yes; then
  
-@@ -5049,10 +5213,10 @@
+@@ -5049,10 +5058,10 @@
  if test "$cf_have_dlsym" = yes ; then
         test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
  
 -       echo "$as_me:5052: checking whether able to link to dl*() functions" >&5
-+       echo "$as_me:5216: checking whether able to link to dl*() functions" >&5
++       echo "$as_me:5061: checking whether able to link to dl*() functions" >&5
  echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5055 "configure"
-+#line 5219 "configure"
++#line 5064 "configure"
  #include "confdefs.h"
  #include <dlfcn.h>
  int
-@@ -5070,16 +5234,16 @@
+@@ -5070,16 +5079,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5073: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5082: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5076: \$? = $ac_status" >&5
-+  echo "$as_me:5240: \$? = $ac_status" >&5
++  echo "$as_me:5085: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5079: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5088: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5082: \$? = $ac_status" >&5
-+  echo "$as_me:5246: \$? = $ac_status" >&5
++  echo "$as_me:5091: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                 cat >>confdefs.h <<\EOF
-@@ -5090,15 +5254,15 @@
+@@ -5090,15 +5099,15 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  
 -               { { echo "$as_me:5093: error: Cannot link test program for libdl" >&5
-+               { { echo "$as_me:5257: error: Cannot link test program for libdl" >&5
++               { { echo "$as_me:5102: error: Cannot link test program for libdl" >&5
  echo "$as_me: error: Cannot link test program for libdl" >&2;}
     { (exit 1); exit 1; }; }
@@ -15335 +17868 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -       echo "$as_me:5098: result: ok" >&5
-+       echo "$as_me:5262: result: ok" >&5
++       echo "$as_me:5107: result: ok" >&5
  echo "${ECHO_T}ok" >&6
  else
 -       { { echo "$as_me:5101: error: Cannot find dlsym function" >&5
-+       { { echo "$as_me:5265: error: Cannot find dlsym function" >&5
++       { { echo "$as_me:5110: error: Cannot find dlsym function" >&5
  echo "$as_me: error: Cannot find dlsym function" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5106,12 +5270,12 @@
+@@ -5106,12 +5115,12 @@
                 if test "$with_gpm" != yes ; then
                         test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
  
 -echo "${as_me:-configure}:5109: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5273: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:5118: testing assuming soname for gpm is $with_gpm ..." 1>&5
  
                         cf_cv_gpm_soname="$with_gpm"
@@ -15354 +17887 @@
  
 -echo "$as_me:5114: checking for soname of gpm library" >&5
-+echo "$as_me:5278: checking for soname of gpm library" >&5
++echo "$as_me:5123: 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
-@@ -5129,15 +5293,15 @@
+@@ -5129,15 +5138,15 @@
  CF_EOF
  cf_save_LIBS="$LIBS"
         LIBS="-lgpm $LIBS"
 -       if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:5296: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:5141: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5135: \$? = $ac_status" >&5
-+  echo "$as_me:5299: \$? = $ac_status" >&5
++  echo "$as_me:5144: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
 -               if { (eval echo "$as_me:5137: \"$ac_link\"") >&5
-+               if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
++               if { (eval echo "$as_me:5146: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5140: \$? = $ac_status" >&5
-+  echo "$as_me:5304: \$? = $ac_status" >&5
++  echo "$as_me:5149: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
                         test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5148,7 +5312,7 @@
+@@ -5148,7 +5157,7 @@
  fi
  
  fi
 -echo "$as_me:5151: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5315: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:5160: result: $cf_cv_gpm_soname" >&5
  echo "${ECHO_T}$cf_cv_gpm_soname" >&6
  
                 fi
-@@ -5165,7 +5329,7 @@
+@@ -5165,7 +5174,7 @@
  #define HAVE_LIBGPM 1
  EOF
  
 -echo "$as_me:5168: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5332: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:5177: 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
-@@ -5173,7 +5337,7 @@
+@@ -5173,7 +5182,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5176 "configure"
-+#line 5340 "configure"
++#line 5185 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5192,16 +5356,16 @@
+@@ -5192,16 +5201,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5195: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5204: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5198: \$? = $ac_status" >&5
-+  echo "$as_me:5362: \$? = $ac_status" >&5
++  echo "$as_me:5207: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5210: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5204: \$? = $ac_status" >&5
-+  echo "$as_me:5368: \$? = $ac_status" >&5
++  echo "$as_me:5213: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Wgetch=yes
  else
-@@ -5212,11 +5376,11 @@
+@@ -5212,11 +5221,11 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5215: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5379: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:5224: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
  if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
  
 -echo "$as_me:5219: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5383: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:5228: 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
-@@ -5240,15 +5404,15 @@
+@@ -5240,15 +5249,15 @@
         # to rely on the static library, noting that some packagers may not
         # include it.
         LIBS="-static -lgpm -dynamic $LIBS"
 -       if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:5407: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:5252: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5246: \$? = $ac_status" >&5
-+  echo "$as_me:5410: \$? = $ac_status" >&5
++  echo "$as_me:5255: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
 -               if { (eval echo "$as_me:5248: \"$ac_link\"") >&5
-+               if { (eval echo "$as_me:5412: \"$ac_link\"") >&5
++               if { (eval echo "$as_me:5257: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5251: \$? = $ac_status" >&5
-+  echo "$as_me:5415: \$? = $ac_status" >&5
++  echo "$as_me:5260: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
                         test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5260,11 +5424,11 @@
+@@ -5260,11 +5269,11 @@
  fi
  
  fi
 -echo "$as_me:5263: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5427: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:5272: 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 "$as_me:5267: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+       { echo "$as_me:5431: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++       { echo "$as_me:5276: 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
  
-@@ -5274,7 +5438,7 @@
+@@ -5274,7 +5283,7 @@
  
  # not everyone has "test -c"
  if test -c /dev/sysmouse 2>/dev/null ; then
 -echo "$as_me:5277: checking if you want to use sysmouse" >&5
-+echo "$as_me:5441: checking if you want to use sysmouse" >&5
++echo "$as_me:5286: 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.
-@@ -5286,7 +5450,7 @@
+@@ -5286,7 +5295,7 @@
  fi;
         if test "$cf_with_sysmouse" != no ; then
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5289 "configure"
-+#line 5453 "configure"
++#line 5298 "configure"
  #include "confdefs.h"
  
  #include <osreldate.h>
-@@ -5309,16 +5473,16 @@
+@@ -5309,16 +5318,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5312: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5321: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5315: \$? = $ac_status" >&5
-+  echo "$as_me:5479: \$? = $ac_status" >&5
++  echo "$as_me:5324: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5318: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5327: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5321: \$? = $ac_status" >&5
-+  echo "$as_me:5485: \$? = $ac_status" >&5
++  echo "$as_me:5330: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_with_sysmouse=yes
  else
-@@ -5328,7 +5492,7 @@
+@@ -5328,7 +5337,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 -echo "$as_me:5331: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5495: result: $cf_with_sysmouse" >&5
++echo "$as_me:5340: result: $cf_with_sysmouse" >&5
  echo "${ECHO_T}$cf_with_sysmouse" >&6
  test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
  #define USE_SYSMOUSE 1
-@@ -5346,7 +5510,7 @@
+@@ -5346,7 +5355,7 @@
         test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
  fi
  
 -echo "$as_me:5349: checking for default loader flags" >&5
-+echo "$as_me:5513: checking for default loader flags" >&5
++echo "$as_me:5358: checking for default loader flags" >&5
  echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
  case $DFT_LWR_MODEL in
  libtool) LD_MODEL=''   ;;
-@@ -5355,13 +5519,13 @@
+@@ -5355,13 +5364,13 @@
  profile) LD_MODEL='-pg';;
  shared)  LD_MODEL=''   ;;
  esac
 -echo "$as_me:5358: result: $LD_MODEL" >&5
-+echo "$as_me:5522: result: $LD_MODEL" >&5
++echo "$as_me:5367: result: $LD_MODEL" >&5
  echo "${ECHO_T}$LD_MODEL" >&6
  
@@ -15543 +18076 @@
  
 -echo "$as_me:5364: checking if rpath option should be used" >&5
-+echo "$as_me:5528: checking if rpath option should be used" >&5
++echo "$as_me:5373: 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.
-@@ -5371,10 +5535,10 @@
+@@ -5371,10 +5380,10 @@
  else
    cf_cv_enable_rpath=no
  fi;
 -echo "$as_me:5374: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5538: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5383: result: $cf_cv_enable_rpath" >&5
  echo "${ECHO_T}$cf_cv_enable_rpath" >&6
  
 -echo "$as_me:5377: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5541: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5386: 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.
-@@ -5384,13 +5548,13 @@
+@@ -5384,13 +5393,13 @@
  else
    cf_cv_do_relink=yes
  fi;
 -echo "$as_me:5387: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5551: result: $cf_cv_do_relink" >&5
++echo "$as_me:5396: result: $cf_cv_do_relink" >&5
  echo "${ECHO_T}$cf_cv_do_relink" >&6
         ;;
@@ -15572 +18105 @@
  LD_RPATH_OPT=
 -echo "$as_me:5393: checking for an rpath option" >&5
-+echo "$as_me:5557: checking for an rpath option" >&5
++echo "$as_me:5402: checking for an rpath option" >&5
  echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
  case $cf_cv_system_name in #(vi
  irix*) #(vi
-@@ -5403,10 +5567,10 @@
+@@ -5403,10 +5412,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -15589 +18122 @@
         ;;
  netbsd*) #(vi
-@@ -5421,17 +5585,17 @@
+@@ -5421,17 +5430,17 @@
  *)
         ;;
  esac
 -echo "$as_me:5424: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5588: result: $LD_RPATH_OPT" >&5
++echo "$as_me:5433: result: $LD_RPATH_OPT" >&5
  echo "${ECHO_T}$LD_RPATH_OPT" >&6
  
@@ -15600 +18133 @@
  x-R*)
 -       echo "$as_me:5429: checking if we need a space after rpath option" >&5
-+       echo "$as_me:5593: checking if we need a space after rpath option" >&5
++       echo "$as_me:5438: 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"
@@ -15606 +18139 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5434 "configure"
-+#line 5598 "configure"
++#line 5443 "configure"
  #include "confdefs.h"
  
  int
-@@ -5443,16 +5607,16 @@
+@@ -5443,16 +5452,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5455: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5449: \$? = $ac_status" >&5
-+  echo "$as_me:5613: \$? = $ac_status" >&5
++  echo "$as_me:5458: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5461: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5455: \$? = $ac_status" >&5
-+  echo "$as_me:5619: \$? = $ac_status" >&5
++  echo "$as_me:5464: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_space=no
  else
-@@ -5462,7 +5626,7 @@
+@@ -5462,7 +5471,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         LIBS="$cf_save_LIBS"
 -       echo "$as_me:5465: result: $cf_rpath_space" >&5
-+       echo "$as_me:5629: result: $cf_rpath_space" >&5
++       echo "$as_me:5474: result: $cf_rpath_space" >&5
  echo "${ECHO_T}$cf_rpath_space" >&6
         test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
         ;;
-@@ -5477,7 +5641,7 @@
+@@ -5477,7 +5486,7 @@
         cf_ld_rpath_opt=
         test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
  
 -       echo "$as_me:5480: checking if release/abi version should be used for shared libs" >&5
-+       echo "$as_me:5644: checking if release/abi version should be used for shared libs" >&5
++       echo "$as_me:5489: 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.
-@@ -5492,7 +5656,7 @@
+@@ -5492,7 +5501,7 @@
                 cf_cv_shlib_version=$withval
                 ;;
         *)
 -               { { echo "$as_me:5495: error: option value must be one of: rel, abi, auto or no" >&5
-+               { { echo "$as_me:5659: error: option value must be one of: rel, abi, auto or no" >&5
++               { { echo "$as_me:5504: error: option value must be one of: rel, abi, auto or no" >&5
  echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
     { (exit 1); exit 1; }; }
                 ;;
-@@ -5501,7 +5665,7 @@
+@@ -5501,7 +5510,7 @@
  else
    cf_cv_shlib_version=auto
  fi;
 -       echo "$as_me:5504: result: $cf_cv_shlib_version" >&5
-+       echo "$as_me:5668: result: $cf_cv_shlib_version" >&5
++       echo "$as_me:5513: result: $cf_cv_shlib_version" >&5
  echo "${ECHO_T}$cf_cv_shlib_version" >&6
  
         cf_cv_rm_so_locs=no
-@@ -5510,14 +5674,14 @@
+@@ -5510,14 +5519,14 @@
         CC_SHARED_OPTS=
         if test "$GCC" = yes
         then
 -               echo "$as_me:5513: checking which $CC option to use" >&5
-+               echo "$as_me:5677: checking which $CC option to use" >&5
++               echo "$as_me:5522: checking which $CC option to use" >&5
  echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
                 cf_save_CFLAGS="$CFLAGS"
@@ -15680 +18213 @@
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 5520 "configure"
-+#line 5684 "configure"
++#line 5529 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5529,16 +5693,16 @@
+@@ -5529,16 +5538,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5532: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5541: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5535: \$? = $ac_status" >&5
-+  echo "$as_me:5699: \$? = $ac_status" >&5
++  echo "$as_me:5544: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5538: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5547: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5541: \$? = $ac_status" >&5
-+  echo "$as_me:5705: \$? = $ac_status" >&5
++  echo "$as_me:5550: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -5547,7 +5711,7 @@
+@@ -5547,7 +5556,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 done
 -               echo "$as_me:5550: result: $CC_SHARED_OPTS" >&5
-+               echo "$as_me:5714: result: $CC_SHARED_OPTS" >&5
++               echo "$as_me:5559: result: $CC_SHARED_OPTS" >&5
  echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                 CFLAGS="$cf_save_CFLAGS"
         fi
-@@ -5555,10 +5719,14 @@
+@@ -5555,10 +5564,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -15731 +18264 @@
                 ;;
         beos*) #(vi
-@@ -5589,7 +5757,7 @@
+@@ -5589,7 +5602,7 @@
                 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                 cf_cv_shlib_version_infix=yes
 -               echo "$as_me:5592: checking if ld -search_paths_first works" >&5
-+               echo "$as_me:5760: checking if ld -search_paths_first works" >&5
++               echo "$as_me:5605: 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
-@@ -5598,7 +5766,7 @@
+@@ -5598,7 +5611,7 @@
                         cf_save_LDFLAGS=$LDFLAGS
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 5601 "configure"
-+#line 5769 "configure"
++#line 5614 "configure"
  #include "confdefs.h"
  
  int
-@@ -5610,16 +5778,16 @@
+@@ -5610,16 +5623,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5613: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5616: \$? = $ac_status" >&5
-+  echo "$as_me:5784: \$? = $ac_status" >&5
++  echo "$as_me:5629: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5622: \$? = $ac_status" >&5
-+  echo "$as_me:5790: \$? = $ac_status" >&5
++  echo "$as_me:5635: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ldflags_search_paths_first=yes
  else
-@@ -5630,7 +5798,7 @@
+@@ -5630,7 +5643,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                 LDFLAGS=$cf_save_LDFLAGS
  fi
 -echo "$as_me:5633: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:5801: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:5646: result: $cf_cv_ldflags_search_paths_first" >&5
  echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                 if test $cf_cv_ldflags_search_paths_first = yes; then
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -5649,9 +5817,19 @@
+@@ -5649,9 +5662,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -15800 +18333 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -5668,7 +5846,7 @@
+@@ -5668,7 +5691,7 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -15809 +18342 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -5680,13 +5858,13 @@
+@@ -5680,13 +5703,34 @@
  
                 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                 ;;
 -       openbsd[2-9].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\$1
++               IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \$SHARED_LIB
++               ** IMPORT_LIB \$IMPORT_LIB
++EOF
++               exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[2-9].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -15825 +18379 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
  
-@@ -5704,12 +5882,12 @@
+@@ -5704,12 +5748,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -15841 +18395 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -5726,7 +5904,7 @@
+@@ -5726,7 +5770,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -15850 +18404 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -5810,7 +5988,7 @@
+@@ -5810,7 +5854,7 @@
                         do
                                 CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 5813 "configure"
-+#line 5991 "configure"
++#line 5857 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5822,16 +6000,16 @@
+@@ -5822,16 +5866,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5825: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5869: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5828: \$? = $ac_status" >&5
-+  echo "$as_me:6006: \$? = $ac_status" >&5
++  echo "$as_me:5872: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5831: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5875: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5834: \$? = $ac_status" >&5
-+  echo "$as_me:6012: \$? = $ac_status" >&5
++  echo "$as_me:5878: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -5868,21 +6046,21 @@
+@@ -5868,21 +5912,29 @@
                         test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                         ;;
                 *)
 -                       { echo "$as_me:5871: WARNING: ignored --with-shlib-version" >&5
-+                       { echo "$as_me:6049: WARNING: ignored --with-shlib-version" >&5
++                       { echo "$as_me:5915: WARNING: ignored --with-shlib-version" >&5
  echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                         ;;
@@ -15898 +18452 @@
 +       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 "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
++
++echo "${as_me:-configure}:5928: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++
++       test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
++
++echo "${as_me:-configure}:5932: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
  
  if test "$CC_SHARED_OPTS" = "unknown"; then
@@ -15903 +18465 @@
                 if test "$model" = "shared"; then
 -                       { { echo "$as_me:5885: error: Shared libraries are not supported in this version" >&5
-+                       { { echo "$as_me:6063: error: Shared libraries are not supported in this version" >&5
++                       { { echo "$as_me:5937: 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
-@@ -5892,7 +6070,7 @@
+@@ -5892,7 +5944,7 @@
  ### If we're building with rpath, try to link non-standard libs that way too.
  if test "$DFT_LWR_MODEL" = "shared"; then
  
 -echo "$as_me:5895: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6073: checking if rpath-hack should be disabled" >&5
++echo "$as_me:5947: 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.
-@@ -5909,21 +6087,21 @@
+@@ -5909,21 +5961,21 @@
    cf_disable_rpath_hack=no
  
  fi;
 -echo "$as_me:5912: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6090: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:5964: result: $cf_disable_rpath_hack" >&5
  echo "${ECHO_T}$cf_disable_rpath_hack" >&6
  if test "$cf_disable_rpath_hack" = no ; then
  
 -echo "$as_me:5916: checking for updated LDFLAGS" >&5
-+echo "$as_me:6094: checking for updated LDFLAGS" >&5
++echo "$as_me:5968: checking for updated LDFLAGS" >&5
  echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
  if test -n "$LD_RPATH_OPT" ; then
 -       echo "$as_me:5919: result: maybe" >&5
-+       echo "$as_me:6097: result: maybe" >&5
++       echo "$as_me:5971: result: maybe" >&5
  echo "${ECHO_T}maybe" >&6
  
@@ -15938 +18500 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:5926: checking for $ac_word" >&5
-+echo "$as_me:6104: checking for $ac_word" >&5
++echo "$as_me:5978: 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
-@@ -5938,7 +6116,7 @@
+@@ -5938,7 +5990,7 @@
    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:5941: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6119: found $ac_dir/$ac_word" >&5
++echo "$as_me:5993: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -5946,10 +6124,10 @@
+@@ -5946,10 +5998,10 @@
  fi
  cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
  if test -n "$cf_ldd_prog"; then
 -  echo "$as_me:5949: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6127: result: $cf_ldd_prog" >&5
++  echo "$as_me:6001: result: $cf_ldd_prog" >&5
  echo "${ECHO_T}$cf_ldd_prog" >&6
  else
 -  echo "$as_me:5952: result: no" >&5
-+  echo "$as_me:6130: result: no" >&5
++  echo "$as_me:6004: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -5963,7 +6141,7 @@
+@@ -5963,7 +6015,7 @@
                 cf_rpath_oops=
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5966 "configure"
-+#line 6144 "configure"
++#line 6018 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5975,16 +6153,16 @@
+@@ -5975,16 +6027,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5978: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6030: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5981: \$? = $ac_status" >&5
-+  echo "$as_me:6159: \$? = $ac_status" >&5
++  echo "$as_me:6033: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5984: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6036: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5987: \$? = $ac_status" >&5
-+  echo "$as_me:6165: \$? = $ac_status" >&5
++  echo "$as_me:6039: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
                  cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
-@@ -6012,7 +6190,7 @@
+@@ -6012,7 +6064,7 @@
                                         then
                                                 test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
  
 -echo "${as_me:-configure}:6015: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6193: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:6067: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
  
                                                 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                 break
-@@ -6024,11 +6202,11 @@
+@@ -6024,11 +6076,11 @@
  
         test -n "$verbose" && echo "    ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6027: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6205: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6079: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
  
  test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6031: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6209: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6083: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
  
  cf_rpath_dst=
  for cf_rpath_src in $LDFLAGS
-@@ -6065,7 +6243,7 @@
+@@ -6065,7 +6117,7 @@
                         then
                                 test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
  
 -echo "${as_me:-configure}:6068: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6246: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6120: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
  
                                 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                         fi
-@@ -6078,11 +6256,11 @@
+@@ -6078,11 +6130,11 @@
  
  test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6081: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6259: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6133: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
  
  test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
  
 -echo "${as_me:-configure}:6085: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6263: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6137: testing ...checking LIBS $LIBS ..." 1>&5
  
  cf_rpath_dst=
  for cf_rpath_src in $LIBS
-@@ -6119,7 +6297,7 @@
+@@ -6119,7 +6171,7 @@
                         then
                                 test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
  
 -echo "${as_me:-configure}:6122: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6300: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6174: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
  
                                 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                         fi
-@@ -6132,11 +6310,11 @@
+@@ -6132,11 +6184,11 @@
  
  test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
  
 -echo "${as_me:-configure}:6135: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6313: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6187: testing ...checked LIBS $LIBS ..." 1>&5
  
         test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6139: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6317: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- fi
- 
-@@ -6147,7 +6325,7 @@
++echo "${as_me:-configure}:6191: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ fi
+ 
+@@ -6147,7 +6199,7 @@
  ###############################################################################
  
  ###    use option --disable-overwrite to leave out the link to -lcurses
 -echo "$as_me:6150: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6328: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:6202: 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.
-@@ -6157,10 +6335,10 @@
+@@ -6157,10 +6209,10 @@
  else
    if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
  fi;
 -echo "$as_me:6160: result: $with_overwrite" >&5
-+echo "$as_me:6338: result: $with_overwrite" >&5
++echo "$as_me:6212: result: $with_overwrite" >&5
  echo "${ECHO_T}$with_overwrite" >&6
  
 -echo "$as_me:6163: checking if external terminfo-database is used" >&5
-+echo "$as_me:6341: checking if external terminfo-database is used" >&5
++echo "$as_me:6215: 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.
-@@ -6170,7 +6348,7 @@
+@@ -6170,7 +6222,7 @@
  else
    use_database=yes
  fi;
 -echo "$as_me:6173: result: $use_database" >&5
-+echo "$as_me:6351: result: $use_database" >&5
++echo "$as_me:6225: result: $use_database" >&5
  echo "${ECHO_T}$use_database" >&6
  
  case $host_os in #(vi
-@@ -6182,17 +6360,12 @@
+@@ -6182,17 +6234,12 @@
         ;;
  esac
@@ -16109 +18671 @@
  
 -       echo "$as_me:6195: checking which terminfo source-file will be installed" >&5
-+       echo "$as_me:6368: checking which terminfo source-file will be installed" >&5
++       echo "$as_me:6242: 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.
-@@ -6200,10 +6373,10 @@
+@@ -6200,10 +6247,10 @@
    withval="$with_database"
    TERMINFO_SRC=$withval
  fi;
 -       echo "$as_me:6203: result: $TERMINFO_SRC" >&5
-+       echo "$as_me:6376: result: $TERMINFO_SRC" >&5
++       echo "$as_me:6250: result: $TERMINFO_SRC" >&5
  echo "${ECHO_T}$TERMINFO_SRC" >&6
  
 -       echo "$as_me:6206: checking whether to use hashed database instead of directory/tree" >&5
-+       echo "$as_me:6379: checking whether to use hashed database instead of directory/tree" >&5
++       echo "$as_me:6253: 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.
-@@ -6213,13 +6386,13 @@
+@@ -6213,13 +6260,13 @@
  else
    with_hashed_db=no
  fi;
 -       echo "$as_me:6216: result: $with_hashed_db" >&5
-+       echo "$as_me:6389: result: $with_hashed_db" >&5
++       echo "$as_me:6263: result: $with_hashed_db" >&5
  echo "${ECHO_T}$with_hashed_db" >&6
  else
@@ -16138 +18700 @@
  
 -echo "$as_me:6222: checking for list of fallback descriptions" >&5
-+echo "$as_me:6395: checking for list of fallback descriptions" >&5
++echo "$as_me:6269: 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.
-@@ -6229,11 +6402,11 @@
+@@ -6229,11 +6276,11 @@
  else
    with_fallback=
  fi;
 -echo "$as_me:6232: result: $with_fallback" >&5
-+echo "$as_me:6405: result: $with_fallback" >&5
++echo "$as_me:6279: result: $with_fallback" >&5
  echo "${ECHO_T}$with_fallback" >&6
  FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
  
 -echo "$as_me:6236: checking if you want modern xterm or antique" >&5
-+echo "$as_me:6409: checking if you want modern xterm or antique" >&5
++echo "$as_me:6283: 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.
-@@ -6247,19 +6420,49 @@
+@@ -6247,19 +6294,49 @@
  no)    with_xterm_new=xterm-old;;
  *)     with_xterm_new=xterm-new;;
  esac
 -echo "$as_me:6250: result: $with_xterm_new" >&5
-+echo "$as_me:6423: result: $with_xterm_new" >&5
++echo "$as_me:6297: result: $with_xterm_new" >&5
  echo "${ECHO_T}$with_xterm_new" >&6
  WHICH_XTERM=$with_xterm_new
  
-+echo "$as_me:6427: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:6301: checking if xterm backspace sends BS or DEL" >&5
 +echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
 +
@@ -16186 +18748 @@
 +       ;;
 +esac
-+echo "$as_me:6448: result: $with_xterm_kbs" >&5
++echo "$as_me:6322: result: $with_xterm_kbs" >&5
 +echo "${ECHO_T}$with_xterm_kbs" >&6
 +XTERM_KBS=$with_xterm_kbs
@@ -16197 +18759 @@
  
 -echo "$as_me:6260: checking for list of terminfo directories" >&5
-+echo "$as_me:6458: checking for list of terminfo directories" >&5
++echo "$as_me:6332: checking for list of terminfo directories" >&5
  echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
  
@@ -16208 +18770 @@
  if test "${with_terminfo_dirs+set}" = set; then
    withval="$with_terminfo_dirs"
-@@ -6297,7 +6500,7 @@
+@@ -6285,7 +6362,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval cf_src_path="$cf_src_path"
+   case ".$cf_src_path" in #(vi
+   .NONE/*)
+@@ -6297,7 +6374,7 @@
    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:6300: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:6503: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:6377: 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; }; }
    ;;
-@@ -6310,13 +6513,13 @@
+@@ -6310,13 +6387,13 @@
  
  eval 'TERMINFO_DIRS="$cf_dst_path"'
  
 -echo "$as_me:6313: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:6516: result: $TERMINFO_DIRS" >&5
++echo "$as_me:6390: result: $TERMINFO_DIRS" >&5
  echo "${ECHO_T}$TERMINFO_DIRS" >&6
  test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
@@ -16229 +18800 @@
  
 -echo "$as_me:6319: checking for default terminfo directory" >&5
-+echo "$as_me:6522: checking for default terminfo directory" >&5
++echo "$as_me:6396: 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.
-@@ -6352,7 +6555,7 @@
+@@ -6340,7 +6417,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -6352,7 +6429,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:6355: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:6558: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:6432: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -6361,7 +6564,7 @@
+@@ -6361,7 +6438,7 @@
  fi
  TERMINFO="$withval"
  
 -echo "$as_me:6364: result: $TERMINFO" >&5
-+echo "$as_me:6567: result: $TERMINFO" >&5
++echo "$as_me:6441: result: $TERMINFO" >&5
  echo "${ECHO_T}$TERMINFO" >&6
  cat >>confdefs.h <<EOF
  #define TERMINFO "$TERMINFO"
-@@ -6371,7 +6574,7 @@
+@@ -6371,7 +6448,7 @@
  
  ###    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:6374: checking if big-core option selected" >&5
-+echo "$as_me:6577: checking if big-core option selected" >&5
++echo "$as_me:6451: 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.
-@@ -6383,7 +6586,7 @@
+@@ -6383,7 +6460,7 @@
    with_big_core=no
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6386 "configure"
-+#line 6589 "configure"
++#line 6463 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -6397,15 +6600,15 @@
+@@ -6397,15 +6474,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6400: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6403: \$? = $ac_status" >&5
-+  echo "$as_me:6606: \$? = $ac_status" >&5
++  echo "$as_me:6480: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6408: \$? = $ac_status" >&5
-+  echo "$as_me:6611: \$? = $ac_status" >&5
++  echo "$as_me:6485: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_big_core=yes
  else
-@@ -6417,7 +6620,7 @@
+@@ -6417,7 +6494,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi;
 -echo "$as_me:6420: result: $with_big_core" >&5
-+echo "$as_me:6623: result: $with_big_core" >&5
++echo "$as_me:6497: result: $with_big_core" >&5
  echo "${ECHO_T}$with_big_core" >&6
  test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
  #define HAVE_BIG_CORE 1
-@@ -6426,7 +6629,7 @@
+@@ -6426,7 +6503,7 @@
  ### 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:6429: checking if big-strings option selected" >&5
-+echo "$as_me:6632: checking if big-strings option selected" >&5
++echo "$as_me:6506: 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.
-@@ -6440,8 +6643,8 @@
+@@ -6440,8 +6517,8 @@
                 eval with_big_strings=no
                 ;;
@@ -16318 +18898 @@
                 else
                         eval with_big_strings=no
-@@ -6450,14 +6653,14 @@
+@@ -6450,14 +6527,14 @@
         esac
  
  fi;
 -echo "$as_me:6453: result: $with_big_strings" >&5
-+echo "$as_me:6656: result: $with_big_strings" >&5
++echo "$as_me:6530: result: $with_big_strings" >&5
  echo "${ECHO_T}$with_big_strings" >&6
  
@@ -16331 +18911 @@
  ###    use option --enable-termcap to compile in the termcap fallback support
 -echo "$as_me:6460: checking if you want termcap-fallback support" >&5
-+echo "$as_me:6663: checking if you want termcap-fallback support" >&5
++echo "$as_me:6537: 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.
-@@ -6467,13 +6670,13 @@
+@@ -6467,13 +6544,13 @@
  else
    with_termcap=no
  fi;
 -echo "$as_me:6470: result: $with_termcap" >&5
-+echo "$as_me:6673: result: $with_termcap" >&5
++echo "$as_me:6547: result: $with_termcap" >&5
  echo "${ECHO_T}$with_termcap" >&6
  
@@ -16347 +18927 @@
                 if test -z "$with_fallback" ; then
 -                       { { echo "$as_me:6476: error: You have disabled the database w/o specifying fallbacks" >&5
-+                       { { echo "$as_me:6679: error: You have disabled the database w/o specifying fallbacks" >&5
++                       { { echo "$as_me:6553: 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
-@@ -6485,7 +6688,7 @@
+@@ -6485,7 +6562,7 @@
  else
  
  if test "$with_ticlib" != no ; then
 -       { { echo "$as_me:6488: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+       { { echo "$as_me:6691: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++       { { echo "$as_me:6565: 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
-@@ -6494,7 +6697,7 @@
+@@ -6494,7 +6571,7 @@
  #define USE_TERMCAP 1
  EOF
  
 -echo "$as_me:6497: checking for list of termcap files" >&5
-+echo "$as_me:6700: checking for list of termcap files" >&5
++echo "$as_me:6574: 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.
-@@ -6534,7 +6737,7 @@
+@@ -6522,7 +6599,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval cf_src_path="$cf_src_path"
+   case ".$cf_src_path" in #(vi
+   .NONE/*)
+@@ -6534,7 +6611,7 @@
    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:6537: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:6740: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:6614: 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; }; }
    ;;
-@@ -6547,14 +6750,14 @@
+@@ -6547,14 +6624,14 @@
  
  eval 'TERMPATH="$cf_dst_path"'
  
 -echo "$as_me:6550: result: $TERMPATH" >&5
-+echo "$as_me:6753: result: $TERMPATH" >&5
++echo "$as_me:6627: result: $TERMPATH" >&5
  echo "${ECHO_T}$TERMPATH" >&6
  test -n "$TERMPATH" && cat >>confdefs.h <<EOF
@@ -16391 +18980 @@
  ###    use option --enable-getcap to use a hacked getcap for reading termcaps
 -echo "$as_me:6557: checking if fast termcap-loader is needed" >&5
-+echo "$as_me:6760: checking if fast termcap-loader is needed" >&5
++echo "$as_me:6634: 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.
-@@ -6564,13 +6767,13 @@
+@@ -6564,13 +6641,13 @@
  else
    with_getcap=no
  fi;
 -echo "$as_me:6567: result: $with_getcap" >&5
-+echo "$as_me:6770: result: $with_getcap" >&5
++echo "$as_me:6644: result: $with_getcap" >&5
  echo "${ECHO_T}$with_getcap" >&6
  test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
@@ -16407 +18996 @@
  
 -echo "$as_me:6573: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+echo "$as_me:6776: checking if translated termcaps will be cached in ~/.terminfo" >&5
++echo "$as_me:6650: 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.
-@@ -6580,7 +6783,7 @@
+@@ -6580,7 +6657,7 @@
  else
    with_getcap_cache=no
  fi;
 -echo "$as_me:6583: result: $with_getcap_cache" >&5
-+echo "$as_me:6786: result: $with_getcap_cache" >&5
++echo "$as_me:6660: result: $with_getcap_cache" >&5
  echo "${ECHO_T}$with_getcap_cache" >&6
  test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
  #define USE_GETCAP_CACHE 1
-@@ -6589,7 +6792,7 @@
+@@ -6589,7 +6666,7 @@
  fi
  
  ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
 -echo "$as_me:6592: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:6795: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:6669: 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.
-@@ -6599,13 +6802,13 @@
+@@ -6599,13 +6676,13 @@
  else
    with_home_terminfo=yes
  fi;
 -echo "$as_me:6602: result: $with_home_terminfo" >&5
-+echo "$as_me:6805: result: $with_home_terminfo" >&5
++echo "$as_me:6679: result: $with_home_terminfo" >&5
  echo "${ECHO_T}$with_home_terminfo" >&6
  test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
@@ -16441 +19030 @@
  
 -echo "$as_me:6608: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:6811: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:6685: 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.
-@@ -6615,7 +6818,7 @@
+@@ -6615,7 +6692,7 @@
  else
    with_root_environ=yes
  fi;
 -echo "$as_me:6618: result: $with_root_environ" >&5
-+echo "$as_me:6821: result: $with_root_environ" >&5
++echo "$as_me:6695: result: $with_root_environ" >&5
  echo "${ECHO_T}$with_root_environ" >&6
  test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
  #define USE_ROOT_ENVIRON 1
-@@ -6629,13 +6832,13 @@
+@@ -6629,13 +6706,13 @@
         unlink
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:6632: checking for $ac_func" >&5
-+echo "$as_me:6835: checking for $ac_func" >&5
++echo "$as_me:6709: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -16466 +19055 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6638 "configure"
-+#line 6841 "configure"
++#line 6715 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -6666,16 +6869,16 @@
+@@ -6658,7 +6735,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6666,16 +6743,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6746: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6672: \$? = $ac_status" >&5
-+  echo "$as_me:6875: \$? = $ac_status" >&5
++  echo "$as_me:6749: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6752: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6678: \$? = $ac_status" >&5
-+  echo "$as_me:6881: \$? = $ac_status" >&5
++  echo "$as_me:6755: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -6685,7 +6888,7 @@
+@@ -6685,7 +6762,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6688: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6891: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6765: 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
-@@ -6702,13 +6905,13 @@
+@@ -6702,13 +6779,13 @@
                 symlink
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:6705: checking for $ac_func" >&5
-+echo "$as_me:6908: checking for $ac_func" >&5
++echo "$as_me:6782: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -16512 +19110 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6711 "configure"
-+#line 6914 "configure"
++#line 6788 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -6739,16 +6942,16 @@
+@@ -6731,7 +6808,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6739,16 +6816,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6742: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6819: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6745: \$? = $ac_status" >&5
-+  echo "$as_me:6948: \$? = $ac_status" >&5
++  echo "$as_me:6822: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6825: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6751: \$? = $ac_status" >&5
-+  echo "$as_me:6954: \$? = $ac_status" >&5
++  echo "$as_me:6828: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -6758,7 +6961,7 @@
+@@ -6758,7 +6835,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6761: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6964: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6838: 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
-@@ -6769,7 +6972,7 @@
+@@ -6769,7 +6846,7 @@
  done
  
  else
 -       echo "$as_me:6772: checking if link/symlink functions work" >&5
-+       echo "$as_me:6975: checking if link/symlink functions work" >&5
++       echo "$as_me:6849: 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
-@@ -6782,7 +6985,7 @@
+@@ -6782,7 +6859,7 @@
                         eval 'ac_cv_func_'$cf_func'=error'
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6785 "configure"
-+#line 6988 "configure"
++#line 6862 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -6812,15 +7015,15 @@
+@@ -6812,15 +6889,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6892: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6818: \$? = $ac_status" >&5
-+  echo "$as_me:7021: \$? = $ac_status" >&5
++  echo "$as_me:6895: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6820: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6897: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6823: \$? = $ac_status" >&5
-+  echo "$as_me:7026: \$? = $ac_status" >&5
++  echo "$as_me:6900: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                         cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -6838,7 +7041,7 @@
+@@ -6838,7 +6915,7 @@
                 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
  
  fi
 -echo "$as_me:6841: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7044: result: $cf_cv_link_funcs" >&5
++echo "$as_me:6918: result: $cf_cv_link_funcs" >&5
  echo "${ECHO_T}$cf_cv_link_funcs" >&6
         test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
  #define HAVE_LINK 1
-@@ -6856,7 +7059,7 @@
+@@ -6856,7 +6933,7 @@
  # soft links (symbolic links) are useful for some systems where hard links do
  # not work, or to make it simpler to copy terminfo trees around.
  if test "$ac_cv_func_symlink" = yes ; then
 -    echo "$as_me:6859: checking if tic should use symbolic links" >&5
-+    echo "$as_me:7062: checking if tic should use symbolic links" >&5
++    echo "$as_me:6936: 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.
-@@ -6866,21 +7069,21 @@
+@@ -6866,21 +6943,21 @@
  else
    with_symlinks=no
  fi;
 -    echo "$as_me:6869: result: $with_symlinks" >&5
-+    echo "$as_me:7072: result: $with_symlinks" >&5
++    echo "$as_me:6946: result: $with_symlinks" >&5
  echo "${ECHO_T}$with_symlinks" >&6
  fi
@@ -16615 +19222 @@
  if test "$with_symlinks" = no ; then
 -    echo "$as_me:6876: checking if tic should use hard links" >&5
-+    echo "$as_me:7079: checking if tic should use hard links" >&5
++    echo "$as_me:6953: checking if tic should use hard links" >&5
  echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
      if test "$ac_cv_func_link" = yes ; then
@@ -16623 +19230 @@
      fi
 -    echo "$as_me:6883: result: $with_links" >&5
-+    echo "$as_me:7086: result: $with_links" >&5
++    echo "$as_me:6960: result: $with_links" >&5
  echo "${ECHO_T}$with_links" >&6
  fi
  
-@@ -6893,7 +7096,7 @@
+@@ -6893,7 +6970,7 @@
  EOF
  
  ###   use option --enable-broken-linker to force on use of broken-linker support
 -echo "$as_me:6896: checking if you want broken-linker support code" >&5
-+echo "$as_me:7099: checking if you want broken-linker support code" >&5
++echo "$as_me:6973: 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.
-@@ -6903,7 +7106,7 @@
+@@ -6903,7 +6980,7 @@
  else
    with_broken_linker=${BROKEN_LINKER:-no}
  fi;
 -echo "$as_me:6906: result: $with_broken_linker" >&5
-+echo "$as_me:7109: result: $with_broken_linker" >&5
++echo "$as_me:6983: result: $with_broken_linker" >&5
  echo "${ECHO_T}$with_broken_linker" >&6
  
  BROKEN_LINKER=0
-@@ -6923,14 +7126,14 @@
+@@ -6923,14 +7000,14 @@
                 BROKEN_LINKER=1
                 test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
  
 -echo "${as_me:-configure}:6926: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7129: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7003: testing cygwin linker is broken anyway ..." 1>&5
  
                 ;;
@@ -16658 +19265 @@
  ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
 -echo "$as_me:6933: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7136: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:7010: 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.
-@@ -6940,7 +7143,7 @@
+@@ -6940,7 +7017,7 @@
  else
    with_bsdpad=no
  fi;
 -echo "$as_me:6943: result: $with_bsdpad" >&5
-+echo "$as_me:7146: result: $with_bsdpad" >&5
++echo "$as_me:7020: result: $with_bsdpad" >&5
  echo "${ECHO_T}$with_bsdpad" >&6
  test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
  #define BSD_TPUTS 1
-@@ -6962,7 +7165,7 @@
+@@ -6962,7 +7039,7 @@
  cf_xopen_source=
  
@@ -16680 +19287 @@
         ;;
  cygwin) #(vi
-@@ -6973,6 +7176,7 @@
+@@ -6973,6 +7050,7 @@
         ;;
  darwin*) #(vi
@@ -16688 +19295 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -6990,17 +7194,18 @@
+@@ -6990,17 +7068,18 @@
         ;;
  irix[56].*) #(vi
@@ -16697 +19304 @@
  
 -echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7201: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7075: 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
@@ -16705 +19312 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7003 "configure"
-+#line 7208 "configure"
++#line 7082 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7015,16 +7220,16 @@
+@@ -7015,16 +7094,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7018: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7097: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7021: \$? = $ac_status" >&5
-+  echo "$as_me:7226: \$? = $ac_status" >&5
++  echo "$as_me:7100: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7024: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7027: \$? = $ac_status" >&5
-+  echo "$as_me:7232: \$? = $ac_status" >&5
++  echo "$as_me:7106: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7033,7 +7238,7 @@
+@@ -7033,7 +7112,7 @@
  cf_save="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 7036 "configure"
-+#line 7241 "configure"
++#line 7115 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7048,16 +7253,16 @@
+@@ -7048,16 +7127,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7051: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7256: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7130: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7054: \$? = $ac_status" >&5
-+  echo "$as_me:7259: \$? = $ac_status" >&5
++  echo "$as_me:7133: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7136: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7060: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
++  echo "$as_me:7139: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7072,51 +7277,45 @@
+@@ -7072,51 +7151,45 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:7075: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7280: result: $cf_cv_gnu_source" >&5
++echo "$as_me:7154: result: $cf_cv_gnu_source" >&5
  echo "${ECHO_T}$cf_cv_gnu_source" >&6
  test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
@@ -16814 +19421 @@
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +
-+echo "$as_me:7302: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:7176: 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
@@ -16820 +19427 @@
  else
  
-+echo "${as_me:-configure}:7308: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:7182: testing if the symbol is already defined go no further ..." 1>&5
 +
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7112 "configure"
-+#line 7311 "configure"
++#line 7185 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
@@ -16836 +19443 @@
  #endif
    ;
-@@ -7124,32 +7323,44 @@
+@@ -7124,32 +7197,44 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7200: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7130: \$? = $ac_status" >&5
-+  echo "$as_me:7329: \$? = $ac_status" >&5
++  echo "$as_me:7203: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7133: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7206: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7136: \$? = $ac_status" >&5
-+  echo "$as_me:7335: \$? = $ac_status" >&5
++  echo "$as_me:7209: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_cv_xopen_source=no
@@ -16879 +19486 @@
 +        if test "$cf_want_posix_source" = yes ; then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 7356 "configure"
++#line 7230 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
@@ -16891 +19498 @@
  #endif
    ;
-@@ -7157,57 +7368,94 @@
+@@ -7157,50 +7242,87 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7160: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7245: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7163: \$? = $ac_status" >&5
-+  echo "$as_me:7374: \$? = $ac_status" >&5
++  echo "$as_me:7248: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7251: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7169: \$? = $ac_status" >&5
-+  echo "$as_me:7380: \$? = $ac_status" >&5
++  echo "$as_me:7254: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_cv_xopen_source=no
@@ -16916 +19523 @@
  cat conftest.$ac_ext >&5
 -cf_cv_xopen_source=$cf_XOPEN_SOURCE
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
 -       CPPFLAGS="$cf_save"
--
-+cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
 +        fi
- 
--fi
--echo "$as_me:7184: result: $cf_cv_xopen_source" >&5
--echo "${ECHO_T}$cf_cv_xopen_source" >&6
--       if test "$cf_cv_xopen_source" != no ; then
--
--CFLAGS=`echo "$CFLAGS" | \
--       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
--               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+echo "${as_me:-configure}:7391: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
--CPPFLAGS=`echo "$CPPFLAGS" | \
--       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
--               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++
++echo "${as_me:-configure}:7265: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++
 +        CFLAGS="$cf_trim_CFLAGS"
 +        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+echo "${as_me:-configure}:7396: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
--cf_fix_cppflags=no
--cf_new_cflags=
--cf_new_cppflags=
--cf_new_extra_cppflags=
++
++echo "${as_me:-configure}:7270: testing if the second compile does not leave our definition intact error ..." 1>&5
++
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 7399 "configure"
++#line 7273 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -16956 +19544 @@
 +{
  
--for cf_add_cflags in $cf_temp_xopen_source
--do
--case $cf_fix_cppflags in
--no)
--       case $cf_add_cflags in #(vi
--       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
--               case $cf_add_cflags in
--               -D*)
 +#ifndef _POSIX_C_SOURCE
 +make an error
@@ -16972 +19552 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7288: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7417: \$? = $ac_status" >&5
++  echo "$as_me:7291: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7294: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7423: \$? = $ac_status" >&5
++  echo "$as_me:7297: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -16988 +19568 @@
 +cat conftest.$ac_ext >&5
 +cf_cv_posix_c_source=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
 +        CFLAGS="$cf_save_CFLAGS"
 +        CPPFLAGS="$cf_save_CPPFLAGS"
-+
+ 
+ fi
+-echo "$as_me:7184: result: $cf_cv_xopen_source" >&5
+-echo "${ECHO_T}$cf_cv_xopen_source" >&6
+-       if test "$cf_cv_xopen_source" != no ; then
+-
+-CFLAGS=`echo "$CFLAGS" | \
+-       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+-CPPFLAGS=`echo "$CPPFLAGS" | \
+-       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
 +fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:7439: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:7313: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
-+
+ 
+-               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
 +if test "$cf_cv_posix_c_source" != no ; then
 +       CFLAGS="$cf_trim_CFLAGS"
 +       CPPFLAGS="$cf_trim_CPPFLAGS"
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in $cf_temp_xopen_source
 +for cf_add_cflags in $cf_cv_posix_c_source
-+do
-+case $cf_fix_cppflags in
-+no)
-+       case $cf_add_cflags in #(vi
-+       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
-+               case $cf_add_cflags in
-+               -D*)
-                        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- 
-                        test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-@@ -7273,7 +7521,215 @@
+ do
+ case $cf_fix_cppflags in
+ no)
+@@ -7273,9 +7395,217 @@
         EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
  fi
@@ -17026 +19611 @@
 -       fi
 +fi
-+
+ 
+-cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 +       ;;
 +netbsd*) #(vi
@@ -17053 +19639 @@
 +*)
 +
-+echo "$as_me:7552: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:7426: 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
@@ -17060 +19646 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 7559 "configure"
++#line 7433 "configure"
 +#include "confdefs.h"
 +
@@ -17079 +19665 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7578: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7452: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7581: \$? = $ac_status" >&5
++  echo "$as_me:7455: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7458: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7587: \$? = $ac_status" >&5
++  echo "$as_me:7461: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -17097 +19683 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 7596 "configure"
++#line 7470 "configure"
 +#include "confdefs.h"
 +
@@ -17116 +19702 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7618: \$? = $ac_status" >&5
++  echo "$as_me:7492: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7495: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7624: \$? = $ac_status" >&5
++  echo "$as_me:7498: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -17140 +19726 @@
 +
 +fi
-+echo "$as_me:7639: result: $cf_cv_xopen_source" >&5
++echo "$as_me:7513: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
 +
@@ -17234 +19820 @@
 +
 +fi
- 
- cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
- 
-@@ -7288,16 +7744,16 @@
++
++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
+ 
+ cf_save_CFLAGS="$CFLAGS"
+ cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -7288,16 +7618,16 @@
         sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                 -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
  
 -echo "$as_me:7291: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7747: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:7621: 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
@@ -17249 +19837 @@
  
 -echo "${as_me:-configure}:7297: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7753: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:7627: testing if the symbol is already defined go no further ..." 1>&5
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7300 "configure"
-+#line 7756 "configure"
++#line 7630 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7312,16 +7768,16 @@
+@@ -7312,16 +7642,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7315: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7645: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7318: \$? = $ac_status" >&5
-+  echo "$as_me:7774: \$? = $ac_status" >&5
++  echo "$as_me:7648: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7321: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7651: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7324: \$? = $ac_status" >&5
-+  echo "$as_me:7780: \$? = $ac_status" >&5
++  echo "$as_me:7654: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_posix_c_source=no
  else
-@@ -7342,7 +7798,7 @@
+@@ -7342,14 +7672,362 @@
          esac
          if test "$cf_want_posix_source" = yes ; then
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7345 "configure"
-+#line 7801 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7357,16 +7813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7360: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7816: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7363: \$? = $ac_status" >&5
-+  echo "$as_me:7819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7369: \$? = $ac_status" >&5
-+  echo "$as_me:7825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7377,15 +7833,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-         fi
- 
--echo "${as_me:-configure}:7380: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:7836: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
-         CFLAGS="$cf_trim_CFLAGS"
-         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:7385: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:7841: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
-         cat >conftest.$ac_ext <<_ACEOF
--#line 7388 "configure"
-+#line 7844 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7400,16 +7856,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7859: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7406: \$? = $ac_status" >&5
-+  echo "$as_me:7862: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7865: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7412: \$? = $ac_status" >&5
-+  echo "$as_me:7868: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7417,27 +7873,112 @@
- cat conftest.$ac_ext >&5
- cf_cv_posix_c_source=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--        CFLAGS="$cf_save_CFLAGS"
--        CPPFLAGS="$cf_save_CPPFLAGS"
++#line 7675 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++int
++main ()
++{
++
++#ifdef _POSIX_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:7690: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:7693: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7699: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++        fi
++
++echo "${as_me:-configure}:7710: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++
++        CFLAGS="$cf_trim_CFLAGS"
++        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
++
++echo "${as_me:-configure}:7715: testing if the second compile does not leave our definition intact error ..." 1>&5
++
++        cat >conftest.$ac_ext <<_ACEOF
++#line 7718 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++int
++main ()
++{
++
++#ifndef _POSIX_C_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:7733: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:7736: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:7739: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7742: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_posix_c_source=no
++fi
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +        CFLAGS="$cf_save_CFLAGS"
@@ -17363 +19954 @@
 +
 +fi
-+echo "$as_me:7884: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:7758: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 +
@@ -17439 +20030 @@
 +
 +if test -n "$cf_new_cppflags" ; then
- 
++
 +       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
- 
++fi
++
 +if test -n "$cf_new_extra_cppflags" ; then
 +
 +       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
--echo "$as_me:7428: 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
--       CFLAGS="$cf_trim_CFLAGS"
--       CPPFLAGS="$cf_trim_CPPFLAGS"
++fi
++
 +fi
 +
@@ -17460 +20045 @@
 +
 +if test -n "$cf_xopen_source" ; then
- 
- cf_fix_cppflags=no
- cf_new_cflags=
- cf_new_cppflags=
- cf_new_extra_cppflags=
- 
--for cf_add_cflags in $cf_cv_posix_c_source
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
 +for cf_add_cflags in $cf_xopen_source
- do
- case $cf_fix_cppflags in
- no)
-@@ -7512,17 +8053,196 @@
- 
- fi
- 
--       ;;
--esac
++do
++case $cf_fix_cppflags in
++no)
++       case $cf_add_cflags in #(vi
++       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
++               case $cf_add_cflags in
++               -D*)
++                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++                       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
++                               && test -z "${cf_tst_cflags}" \
++                               && cf_fix_cppflags=yes
++
++                       if test $cf_fix_cppflags = yes ; then
++                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
++                               continue
++                       elif test "${cf_tst_cflags}" = "\"'" ; then
++                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
++                               continue
++                       fi
++                       ;;
++               esac
++               case "$CPPFLAGS" in
++               *$cf_add_cflags) #(vi
++                       ;;
++               *) #(vi
++                       case $cf_add_cflags in #(vi
++                       -D*)
++                               cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++       sed     -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?$//g'`
++
++                               ;;
++                       esac
++                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
++                       ;;
++               esac
++               ;;
++       *)
++               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
++               ;;
++       esac
++       ;;
++yes)
++       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
++
++       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
++               && test -z "${cf_tst_cflags}" \
++               && cf_fix_cppflags=no
++       ;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++       CFLAGS="$CFLAGS $cf_new_cflags"
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
++fi
++
++fi
++
 +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+       echo "$as_me:8057: checking if _XOPEN_SOURCE really is set" >&5
++       echo "$as_me:7931: checking if _XOPEN_SOURCE really is set" >&5
 +echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8060 "configure"
++#line 7934 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
@@ -17487 +20136 @@
 +main ()
 +{
- 
--if test -n "$cf_xopen_source" ; then
++
 +#ifndef _XOPEN_SOURCE
 +make an error
@@ -17497 +20145 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7949: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8078: \$? = $ac_status" >&5
++  echo "$as_me:7952: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7955: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8084: \$? = $ac_status" >&5
++  echo "$as_me:7958: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_XOPEN_SOURCE_set=yes
@@ -17515 +20163 @@
 +fi
 +rm -f conftest.$ac_objext conftest.$ac_ext
-+       echo "$as_me:8093: result: $cf_XOPEN_SOURCE_set" >&5
++       echo "$as_me:7967: result: $cf_XOPEN_SOURCE_set" >&5
 +echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 +       if test $cf_XOPEN_SOURCE_set = yes
 +       then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 8098 "configure"
++#line 7972 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
@@ -17535 +20183 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8113: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7987: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8116: \$? = $ac_status" >&5
++  echo "$as_me:7990: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7993: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8122: \$? = $ac_status" >&5
++  echo "$as_me:7996: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_XOPEN_SOURCE_set_ok=yes
@@ -17555 +20203 @@
 +               if test $cf_XOPEN_SOURCE_set_ok = no
 +               then
-+                       { echo "$as_me:8133: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++                       { echo "$as_me:8007: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 +               fi
 +       else
 +
-+echo "$as_me:8138: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8012: 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
@@ -17567 +20215 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8145 "configure"
-+#include "confdefs.h"
++#line 8019 "configure"
+ #include "confdefs.h"
 +
 +#include <stdlib.h>
 +#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
+ #include <sys/types.h>
++
+ int
+ main ()
+ {
+ 
+-#ifdef _POSIX_SOURCE
 +#ifndef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8164: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8167: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8170: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8173: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -7357,42 +8035,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7360: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8038: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7363: \$? = $ac_status" >&5
++  echo "$as_me:8041: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7369: \$? = $ac_status" >&5
++  echo "$as_me:8047: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  :
 +  cf_cv_xopen_source=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-        fi
+-
+-echo "${as_me:-configure}:7380: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+-
+-        CFLAGS="$cf_trim_CFLAGS"
+-        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+-
+-echo "${as_me:-configure}:7385: testing if the second compile does not leave our definition intact error ..." 1>&5
+-
 +cf_save="$CPPFLAGS"
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+        cat >conftest.$ac_ext <<_ACEOF
-+#line 8182 "configure"
-+#include "confdefs.h"
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 7388 "configure"
++#line 8056 "configure"
+ #include "confdefs.h"
 +
 +#include <stdlib.h>
 +#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
+ #include <sys/types.h>
++
+ int
+ main ()
+ {
+ 
+-#ifndef _POSIX_C_SOURCE
 +#ifdef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8204: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8207: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8210: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -7400,129 +8072,51 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7406: \$? = $ac_status" >&5
++  echo "$as_me:8078: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7412: \$? = $ac_status" >&5
++  echo "$as_me:8084: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  :
 +  cf_cv_xopen_source=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_posix_c_source=no
 +cf_cv_xopen_source=$cf_XOPEN_SOURCE
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-        CFLAGS="$cf_save_CFLAGS"
+-        CPPFLAGS="$cf_save_CPPFLAGS"
 +       CPPFLAGS="$cf_save"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:8225: result: $cf_cv_xopen_source" >&5
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:7428: 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
+-       CFLAGS="$cf_trim_CFLAGS"
+-       CPPFLAGS="$cf_trim_CPPFLAGS"
+-
+-cf_fix_cppflags=no
+-cf_new_cflags=
+-cf_new_cppflags=
+-cf_new_extra_cppflags=
+-
+-for cf_add_cflags in $cf_cv_posix_c_source
+-do
+-case $cf_fix_cppflags in
+-no)
+-       case $cf_add_cflags in #(vi
+-       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+-               case $cf_add_cflags in
+-               -D*)
+-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++echo "$as_me:8099: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
-+
+ 
+-                       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+-                               && test -z "${cf_tst_cflags}" \
+-                               && cf_fix_cppflags=yes
 +if test "$cf_cv_xopen_source" != no ; then
-+
+ 
+-                       if test $cf_fix_cppflags = yes ; then
+-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+-                               continue
+-                       elif test "${cf_tst_cflags}" = "\"'" ; then
+-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+-                               continue
+-                       fi
+-                       ;;
+-               esac
+-               case "$CPPFLAGS" in
+-               *$cf_add_cflags) #(vi
+-                       ;;
+-               *) #(vi
+-                       case $cf_add_cflags in #(vi
+-                       -D*)
+-                               cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 +CFLAGS=`echo "$CFLAGS" | \
 +       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
 +               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
-+CPPFLAGS=`echo "$CPPFLAGS" | \
+ 
+ CPPFLAGS=`echo "$CPPFLAGS" | \
+-       sed     -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?$//g'`
+-
+-                               ;;
+-                       esac
+-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+-                       ;;
+-               esac
+-               ;;
+-       *)
+-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+-               ;;
+-       esac
+-       ;;
+-yes)
+-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+-
+-       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+-
+-       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+-               && test -z "${cf_tst_cflags}" \
+-               && cf_fix_cppflags=no
+-       ;;
+-esac
+-done
+-
+-if test -n "$cf_new_cflags" ; then
+-
+-       CFLAGS="$CFLAGS $cf_new_cflags"
+-fi
+-
+-if test -n "$cf_new_cppflags" ; then
+-
+-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+-fi
+-
+-if test -n "$cf_new_extra_cppflags" ; then
+-
+-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+-fi
+-
+-fi
+-
+-       ;;
+-esac
 +       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
 +               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
+ 
+-if test -n "$cf_xopen_source" ; then
 +       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
  
@@ -17672 +20434 @@
  case $cf_fix_cppflags in
  no)
-@@ -7597,16 +8317,19 @@
+@@ -7597,16 +8191,19 @@
  
  fi
@@ -17682 +20444 @@
  
 -echo "$as_me:7602: checking if SIGWINCH is defined" >&5
-+echo "$as_me:8325: checking if SIGWINCH is defined" >&5
++echo "$as_me:8199: 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
@@ -17690 +20452 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7609 "configure"
-+#line 8332 "configure"
++#line 8206 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -7621,23 +8344,23 @@
+@@ -7621,23 +8218,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7624: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8347: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7627: \$? = $ac_status" >&5
-+  echo "$as_me:8350: \$? = $ac_status" >&5
++  echo "$as_me:8224: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7630: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8227: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7633: \$? = $ac_status" >&5
-+  echo "$as_me:8356: \$? = $ac_status" >&5
++  echo "$as_me:8230: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_define_sigwinch=yes
@@ -17719 +20481 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7640 "configure"
-+#line 8363 "configure"
++#line 8237 "configure"
  #include "confdefs.h"
  
  #undef _XOPEN_SOURCE
-@@ -7655,16 +8378,16 @@
+@@ -7655,16 +8252,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8255: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7661: \$? = $ac_status" >&5
-+  echo "$as_me:8384: \$? = $ac_status" >&5
++  echo "$as_me:8258: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8261: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7667: \$? = $ac_status" >&5
-+  echo "$as_me:8390: \$? = $ac_status" >&5
++  echo "$as_me:8264: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_define_sigwinch=maybe
  else
-@@ -7678,11 +8401,11 @@
+@@ -7678,11 +8275,11 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:7681: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:8404: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:8278: result: $cf_cv_define_sigwinch" >&5
  echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
  
  if test "$cf_cv_define_sigwinch" = maybe ; then
 -echo "$as_me:7685: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:8408: checking for actual SIGWINCH definition" >&5
++echo "$as_me:8282: 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
-@@ -7693,7 +8416,7 @@
+@@ -7693,7 +8290,7 @@
  while test $cf_sigwinch != 1
  do
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7696 "configure"
-+#line 8419 "configure"
++#line 8293 "configure"
  #include "confdefs.h"
  
  #undef _XOPEN_SOURCE
-@@ -7715,16 +8438,16 @@
+@@ -7715,16 +8312,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7718: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8315: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7721: \$? = $ac_status" >&5
-+  echo "$as_me:8444: \$? = $ac_status" >&5
++  echo "$as_me:8318: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8321: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7727: \$? = $ac_status" >&5
-+  echo "$as_me:8450: \$? = $ac_status" >&5
++  echo "$as_me:8324: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_fixup_sigwinch=$cf_sigwinch
          break
-@@ -7738,7 +8461,7 @@
+@@ -7738,7 +8335,7 @@
  done
  
  fi
 -echo "$as_me:7741: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:8464: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:8338: result: $cf_cv_fixup_sigwinch" >&5
  echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
  
         if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -7748,13 +8471,13 @@
+@@ -7748,13 +8345,13 @@
  
  # Checks for CODESET support.
  
 -  echo "$as_me:7751: checking for nl_langinfo and CODESET" >&5
-+  echo "$as_me:8474: checking for nl_langinfo and CODESET" >&5
++  echo "$as_me:8348: 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
@@ -17809 +20571 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 7757 "configure"
-+#line 8480 "configure"
++#line 8354 "configure"
  #include "confdefs.h"
  #include <langinfo.h>
  int
-@@ -7766,16 +8489,16 @@
+@@ -7766,16 +8363,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8366: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7772: \$? = $ac_status" >&5
-+  echo "$as_me:8495: \$? = $ac_status" >&5
++  echo "$as_me:8369: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8372: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7778: \$? = $ac_status" >&5
-+  echo "$as_me:8501: \$? = $ac_status" >&5
++  echo "$as_me:8375: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    am_cv_langinfo_codeset=yes
  else
-@@ -7786,7 +8509,7 @@
+@@ -7786,7 +8383,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:7789: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:8512: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:8386: result: $am_cv_langinfo_codeset" >&5
  echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    if test $am_cv_langinfo_codeset = yes; then
  
-@@ -7800,7 +8523,7 @@
+@@ -7800,7 +8397,7 @@
  NCURSES_OK_WCHAR_T=
  NCURSES_OK_WINT_T=
  
 -echo "$as_me:7803: checking if you want wide-character code" >&5
-+echo "$as_me:8526: checking if you want wide-character code" >&5
++echo "$as_me:8400: 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.
-@@ -7810,7 +8533,7 @@
+@@ -7810,7 +8407,7 @@
  else
    with_widec=no
  fi;
 -echo "$as_me:7813: result: $with_widec" >&5
-+echo "$as_me:8536: result: $with_widec" >&5
++echo "$as_me:8410: result: $with_widec" >&5
  echo "${ECHO_T}$with_widec" >&6
  if test "$with_widec" = yes ; then
         LIB_SUFFIX="w${LIB_SUFFIX}"
-@@ -7818,15 +8541,63 @@
+@@ -7818,15 +8415,63 @@
  #define USE_WIDEC_SUPPORT 1
  EOF
@@ -17873 +20635 @@
 +EOF
 +
-+echo "$as_me:8548: checking if wchar.h can be used as is" >&5
++echo "$as_me:8422: 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
@@ -17880 +20642 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 8555 "configure"
++#line 8429 "configure"
 +#include "confdefs.h"
 +
@@ -17897 +20659 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8575: \$? = $ac_status" >&5
++  echo "$as_me:8449: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8581: \$? = $ac_status" >&5
++  echo "$as_me:8455: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_wchar_h_okay=yes
@@ -17916 +20678 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +fi
-+echo "$as_me:8591: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:8465: result: $cf_cv_wchar_h_okay" >&5
 +echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
 +
@@ -17923 +20685 @@
  
 -echo "$as_me:7826: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:8597: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:8471: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
  echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7829 "configure"
-+#line 8600 "configure"
++#line 8474 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  
-@@ -7842,16 +8613,16 @@
+@@ -7842,16 +8487,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7845: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8490: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7848: \$? = $ac_status" >&5
-+  echo "$as_me:8619: \$? = $ac_status" >&5
++  echo "$as_me:8493: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7851: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8496: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7854: \$? = $ac_status" >&5
-+  echo "$as_me:8625: \$? = $ac_status" >&5
++  echo "$as_me:8499: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=no
  else
-@@ -7860,16 +8631,16 @@
+@@ -7860,16 +8505,16 @@
  cf_result=yes
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:7863: result: $cf_result" >&5
-+echo "$as_me:8634: result: $cf_result" >&5
++echo "$as_me:8508: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
@@ -17964 +20726 @@
  elif test "x" != "x" ; then
 -       echo "$as_me:7869: checking checking for compatible value versus " >&5
-+       echo "$as_me:8640: checking checking for compatible value versus " >&5
++       echo "$as_me:8514: checking checking for compatible value versus " >&5
  echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7872 "configure"
-+#line 8643 "configure"
++#line 8517 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  
-@@ -7885,16 +8656,16 @@
+@@ -7885,16 +8530,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7888: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8533: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7891: \$? = $ac_status" >&5
-+  echo "$as_me:8662: \$? = $ac_status" >&5
++  echo "$as_me:8536: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7894: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8539: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7897: \$? = $ac_status" >&5
-+  echo "$as_me:8668: \$? = $ac_status" >&5
++  echo "$as_me:8542: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -7903,7 +8674,7 @@
+@@ -7903,7 +8548,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -       echo "$as_me:7906: result: $cf_result" >&5
-+       echo "$as_me:8677: result: $cf_result" >&5
++       echo "$as_me:8551: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
         if test "$cf_result" = no ; then
                 # perhaps we can override it - try...
-@@ -7911,8 +8682,7 @@
+@@ -7911,8 +8556,7 @@
         fi
  fi
@@ -18012 +20774 @@
         # with_overwrite=no
         NCURSES_CH_T=cchar_t
-@@ -7920,13 +8690,13 @@
+@@ -7920,13 +8564,13 @@
  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:7923: checking for $ac_func" >&5
-+echo "$as_me:8693: checking for $ac_func" >&5
++echo "$as_me:8567: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -18024 +20786 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 7929 "configure"
-+#line 8699 "configure"
++#line 8573 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -7957,16 +8727,16 @@
+@@ -7949,7 +8593,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -7957,16 +8601,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7960: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8604: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7963: \$? = $ac_status" >&5
-+  echo "$as_me:8733: \$? = $ac_status" >&5
++  echo "$as_me:8607: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7966: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8610: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7969: \$? = $ac_status" >&5
-+  echo "$as_me:8739: \$? = $ac_status" >&5
++  echo "$as_me:8613: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -7976,7 +8746,7 @@
+@@ -7976,7 +8620,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:7979: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:8749: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:8623: 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
-@@ -7988,7 +8758,7 @@
+@@ -7988,7 +8632,7 @@
  
         if test "$ac_cv_func_putwc" != yes ; then
  
 -echo "$as_me:7991: checking for multibyte character support" >&5
-+echo "$as_me:8761: checking for multibyte character support" >&5
++echo "$as_me:8635: 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
-@@ -7996,7 +8766,7 @@
+@@ -7996,7 +8640,7 @@
  
         cf_save_LIBS="$LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7999 "configure"
-+#line 8769 "configure"
++#line 8643 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8009,16 +8779,16 @@
+@@ -8009,16 +8653,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8012: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8656: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8015: \$? = $ac_status" >&5
-+  echo "$as_me:8785: \$? = $ac_status" >&5
++  echo "$as_me:8659: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8018: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8662: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8021: \$? = $ac_status" >&5
-+  echo "$as_me:8791: \$? = $ac_status" >&5
++  echo "$as_me:8665: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -8030,12 +8800,12 @@
+@@ -8030,12 +8674,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
 -echo "${as_me:-configure}:8033: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:8803: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8677: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
@@ -18108 +20879 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8038 "configure"
-+#line 8808 "configure"
++#line 8682 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8048,16 +8818,16 @@
+@@ -8048,16 +8692,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8051: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8695: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8054: \$? = $ac_status" >&5
-+  echo "$as_me:8824: \$? = $ac_status" >&5
++  echo "$as_me:8698: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8701: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8060: \$? = $ac_status" >&5
-+  echo "$as_me:8830: \$? = $ac_status" >&5
++  echo "$as_me:8704: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -8071,7 +8841,7 @@
+@@ -8071,7 +8715,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8074 "configure"
-+#line 8844 "configure"
++#line 8718 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8084,16 +8854,16 @@
+@@ -8084,16 +8728,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8087: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8731: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8090: \$? = $ac_status" >&5
-+  echo "$as_me:8860: \$? = $ac_status" >&5
++  echo "$as_me:8734: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8737: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8096: \$? = $ac_status" >&5
-+  echo "$as_me:8866: \$? = $ac_status" >&5
++  echo "$as_me:8740: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -8110,9 +8880,9 @@
+@@ -8110,9 +8754,9 @@
  
      test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
  
 -echo "${as_me:-configure}:8113: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:8883: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8757: testing find linkage for utf8 library ..." 1>&5
  
 -echo "${as_me:-configure}:8115: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:8885: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8759: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
      cf_save_CPPFLAGS="$CPPFLAGS"
      cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -8225,11 +8995,11 @@
+@@ -8225,11 +8869,11 @@
        if test -d $cf_cv_header_path_utf8 ; then
          test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:8228: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:8998: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8872: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
  
          CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 8232 "configure"
-+#line 9002 "configure"
++#line 8876 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8242,21 +9012,21 @@
+@@ -8242,21 +8886,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8245: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9015: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8889: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8248: \$? = $ac_status" >&5
-+  echo "$as_me:9018: \$? = $ac_status" >&5
++  echo "$as_me:8892: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8251: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8895: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8254: \$? = $ac_status" >&5
-+  echo "$as_me:9024: \$? = $ac_status" >&5
++  echo "$as_me:8898: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -18212 +20983 @@
  
 -echo "${as_me:-configure}:8259: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9029: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8903: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
              cf_cv_find_linkage_utf8=maybe
              cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -8274,7 +9044,7 @@
+@@ -8274,7 +8918,7 @@
  
      if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
 -echo "${as_me:-configure}:8277: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9047: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8921: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
        cf_save_LIBS="$LIBS"
        cf_save_LDFLAGS="$LDFLAGS"
-@@ -8371,13 +9141,13 @@
+@@ -8371,13 +9015,13 @@
            if test -d $cf_cv_library_path_utf8 ; then
              test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:8374: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9144: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9018: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
  
              CPPFLAGS="$cf_test_CPPFLAGS"
@@ -18237 +21008 @@
              cat >conftest.$ac_ext <<_ACEOF
 -#line 8380 "configure"
-+#line 9150 "configure"
++#line 9024 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8390,21 +9160,21 @@
+@@ -8390,21 +9034,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8393: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9037: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8396: \$? = $ac_status" >&5
-+  echo "$as_me:9166: \$? = $ac_status" >&5
++  echo "$as_me:9040: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9043: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8402: \$? = $ac_status" >&5
-+  echo "$as_me:9172: \$? = $ac_status" >&5
++  echo "$as_me:9046: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -18264 +21035 @@
  
 -echo "${as_me:-configure}:8407: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9177: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9051: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
                  cf_cv_find_linkage_utf8=yes
                  cf_cv_library_file_utf8="-lutf8"
-@@ -8446,7 +9216,7 @@
+@@ -8446,7 +9090,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:8449: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9219: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:9093: 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
-@@ -8480,7 +9250,7 @@
+@@ -8480,7 +9124,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 8483 "configure"
-+#line 9253 "configure"
++#line 9127 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8492,16 +9262,16 @@
+@@ -8492,16 +9136,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8495: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8498: \$? = $ac_status" >&5
-+  echo "$as_me:9268: \$? = $ac_status" >&5
++  echo "$as_me:9142: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8501: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9145: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8504: \$? = $ac_status" >&5
-+  echo "$as_me:9274: \$? = $ac_status" >&5
++  echo "$as_me:9148: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8518,7 +9288,7 @@
+@@ -8518,7 +9162,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:8521: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9291: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9165: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8552,7 +9322,7 @@
+@@ -8552,7 +9196,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:8555: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9325: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:9199: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -8569,14 +9339,14 @@
+@@ -8569,14 +9213,14 @@
         fi
  
  # This is needed on Tru64 5.0 to declare mbstate_t
 -echo "$as_me:8572: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:9342: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:9216: 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
@@ -18338 +21109 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8579 "configure"
-+#line 9349 "configure"
++#line 9223 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8594,23 +9364,23 @@
+@@ -8594,23 +9238,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8600: \$? = $ac_status" >&5
-+  echo "$as_me:9370: \$? = $ac_status" >&5
++  echo "$as_me:9244: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9247: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8606: \$? = $ac_status" >&5
-+  echo "$as_me:9376: \$? = $ac_status" >&5
++  echo "$as_me:9250: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=no
@@ -18367 +21138 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8613 "configure"
-+#line 9383 "configure"
++#line 9257 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8629,16 +9399,16 @@
+@@ -8629,16 +9273,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8632: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8635: \$? = $ac_status" >&5
-+  echo "$as_me:9405: \$? = $ac_status" >&5
++  echo "$as_me:9279: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8638: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8641: \$? = $ac_status" >&5
-+  echo "$as_me:9411: \$? = $ac_status" >&5
++  echo "$as_me:9285: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=yes
  else
-@@ -8650,7 +9420,7 @@
+@@ -8650,7 +9294,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:8653: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:9423: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:9297: result: $cf_cv_mbstate_t" >&5
  echo "${ECHO_T}$cf_cv_mbstate_t" >&6
  
  if test "$cf_cv_mbstate_t" = yes ; then
-@@ -8667,14 +9437,14 @@
+@@ -8667,14 +9311,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wchar_t
 -echo "$as_me:8670: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:9440: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:9314: 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
@@ -18414 +21185 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8677 "configure"
-+#line 9447 "configure"
++#line 9321 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8692,23 +9462,23 @@
+@@ -8692,23 +9336,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8695: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9339: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8698: \$? = $ac_status" >&5
-+  echo "$as_me:9468: \$? = $ac_status" >&5
++  echo "$as_me:9342: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9345: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8704: \$? = $ac_status" >&5
-+  echo "$as_me:9474: \$? = $ac_status" >&5
++  echo "$as_me:9348: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=no
@@ -18443 +21214 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8711 "configure"
-+#line 9481 "configure"
++#line 9355 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8727,16 +9497,16 @@
+@@ -8727,16 +9371,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9374: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8733: \$? = $ac_status" >&5
-+  echo "$as_me:9503: \$? = $ac_status" >&5
++  echo "$as_me:9377: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9380: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8739: \$? = $ac_status" >&5
-+  echo "$as_me:9509: \$? = $ac_status" >&5
++  echo "$as_me:9383: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=yes
  else
-@@ -8748,7 +9518,7 @@
+@@ -8748,7 +9392,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:8751: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:9521: result: $cf_cv_wchar_t" >&5
++echo "$as_me:9395: result: $cf_cv_wchar_t" >&5
  echo "${ECHO_T}$cf_cv_wchar_t" >&6
  
  if test "$cf_cv_wchar_t" = yes ; then
-@@ -8770,14 +9540,14 @@
+@@ -8770,14 +9414,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wint_t
 -echo "$as_me:8773: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:9543: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:9417: 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
@@ -18490 +21261 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8780 "configure"
-+#line 9550 "configure"
++#line 9424 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8795,23 +9565,23 @@
+@@ -8795,23 +9439,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8798: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9568: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9442: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8801: \$? = $ac_status" >&5
-+  echo "$as_me:9571: \$? = $ac_status" >&5
++  echo "$as_me:9445: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9448: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8807: \$? = $ac_status" >&5
-+  echo "$as_me:9577: \$? = $ac_status" >&5
++  echo "$as_me:9451: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=no
@@ -18519 +21290 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8814 "configure"
-+#line 9584 "configure"
++#line 9458 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8830,16 +9600,16 @@
+@@ -8830,16 +9474,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9477: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8836: \$? = $ac_status" >&5
-+  echo "$as_me:9606: \$? = $ac_status" >&5
++  echo "$as_me:9480: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8839: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9483: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8842: \$? = $ac_status" >&5
-+  echo "$as_me:9612: \$? = $ac_status" >&5
++  echo "$as_me:9486: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=yes
  else
-@@ -8851,7 +9621,7 @@
+@@ -8851,7 +9495,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:8854: result: $cf_cv_wint_t" >&5
-+echo "$as_me:9624: result: $cf_cv_wint_t" >&5
++echo "$as_me:9498: result: $cf_cv_wint_t" >&5
  echo "${ECHO_T}$cf_cv_wint_t" >&6
  
  if test "$cf_cv_wint_t" = yes ; then
-@@ -8890,7 +9660,7 @@
+@@ -8890,7 +9534,7 @@
         ;;
  esac
  
 -echo "$as_me:8893: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:9663: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:9537: 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.
-@@ -8900,7 +9670,7 @@
+@@ -8900,7 +9544,7 @@
  else
    with_lp64=$default_with_lp64
  fi;
 -echo "$as_me:8903: result: $with_lp64" >&5
-+echo "$as_me:9673: result: $with_lp64" >&5
++echo "$as_me:9547: result: $with_lp64" >&5
  echo "${ECHO_T}$with_lp64" >&6
  
  if test "$with_lp64" = yes ; then
-@@ -8916,7 +9686,7 @@
+@@ -8916,7 +9560,7 @@
  fi;
  if test "$enable_largefile" != no; then
  
 -  echo "$as_me:8919: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:9689: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:9563: 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
-@@ -8928,7 +9698,7 @@
+@@ -8928,7 +9572,7 @@
          # 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 8931 "configure"
-+#line 9701 "configure"
++#line 9575 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8948,16 +9718,16 @@
+@@ -8948,16 +9592,16 @@
  }
  _ACEOF
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8951: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8954: \$? = $ac_status" >&5
-+  echo "$as_me:9724: \$? = $ac_status" >&5
++  echo "$as_me:9598: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8957: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9601: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8960: \$? = $ac_status" >&5
-+  echo "$as_me:9730: \$? = $ac_status" >&5
++  echo "$as_me:9604: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8967,16 +9737,16 @@
+@@ -8967,16 +9611,16 @@
  rm -f conftest.$ac_objext
          CC="$CC -n32"
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8970: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9614: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8973: \$? = $ac_status" >&5
-+  echo "$as_me:9743: \$? = $ac_status" >&5
++  echo "$as_me:9617: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8976: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9620: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8979: \$? = $ac_status" >&5
-+  echo "$as_me:9749: \$? = $ac_status" >&5
++  echo "$as_me:9623: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_CC=' -n32'; break
  else
-@@ -8990,13 +9760,13 @@
+@@ -8990,13 +9634,13 @@
         rm -f conftest.$ac_ext
      fi
  fi
 -echo "$as_me:8993: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:9763: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:9637: 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
@@ -18643 +21414 @@
  
 -  echo "$as_me:8999: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:9769: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:9643: 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
-@@ -9004,7 +9774,7 @@
+@@ -9004,7 +9648,7 @@
    while :; do
    ac_cv_sys_file_offset_bits=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9007 "configure"
-+#line 9777 "configure"
++#line 9651 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -9024,16 +9794,16 @@
+@@ -9024,16 +9668,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9671: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9030: \$? = $ac_status" >&5
-+  echo "$as_me:9800: \$? = $ac_status" >&5
++  echo "$as_me:9674: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9033: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9677: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9036: \$? = $ac_status" >&5
-+  echo "$as_me:9806: \$? = $ac_status" >&5
++  echo "$as_me:9680: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -9042,7 +9812,7 @@
+@@ -9042,7 +9686,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9045 "configure"
-+#line 9815 "configure"
++#line 9689 "configure"
  #include "confdefs.h"
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -9063,16 +9833,16 @@
+@@ -9063,16 +9707,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9066: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9836: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9710: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9069: \$? = $ac_status" >&5
-+  echo "$as_me:9839: \$? = $ac_status" >&5
++  echo "$as_me:9713: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9072: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9716: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9075: \$? = $ac_status" >&5
-+  echo "$as_me:9845: \$? = $ac_status" >&5
++  echo "$as_me:9719: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_file_offset_bits=64; break
  else
-@@ -9083,7 +9853,7 @@
+@@ -9083,7 +9727,7 @@
    break
  done
  fi
 -echo "$as_me:9086: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:9856: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:9730: 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
  
-@@ -9093,7 +9863,7 @@
+@@ -9093,7 +9737,7 @@
  
  fi
  rm -rf conftest*
 -  echo "$as_me:9096: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:9866: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:9740: 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
-@@ -9101,7 +9871,7 @@
+@@ -9101,7 +9745,7 @@
    while :; do
    ac_cv_sys_large_files=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9104 "configure"
-+#line 9874 "configure"
++#line 9748 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -9121,16 +9891,16 @@
+@@ -9121,16 +9765,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9124: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9127: \$? = $ac_status" >&5
-+  echo "$as_me:9897: \$? = $ac_status" >&5
++  echo "$as_me:9771: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9130: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9133: \$? = $ac_status" >&5
-+  echo "$as_me:9903: \$? = $ac_status" >&5
++  echo "$as_me:9777: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -9139,7 +9909,7 @@
+@@ -9139,7 +9783,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9142 "configure"
-+#line 9912 "configure"
++#line 9786 "configure"
  #include "confdefs.h"
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -9160,16 +9930,16 @@
+@@ -9160,16 +9804,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9163: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9807: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9166: \$? = $ac_status" >&5
-+  echo "$as_me:9936: \$? = $ac_status" >&5
++  echo "$as_me:9810: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9813: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9172: \$? = $ac_status" >&5
-+  echo "$as_me:9942: \$? = $ac_status" >&5
++  echo "$as_me:9816: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_large_files=1; break
  else
-@@ -9180,7 +9950,7 @@
+@@ -9180,7 +9824,7 @@
    break
  done
  fi
 -echo "$as_me:9183: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:9953: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:9827: 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
  
-@@ -9193,7 +9963,7 @@
+@@ -9193,7 +9837,7 @@
  fi
  
      if test "$enable_largefile" != no ; then
 -       echo "$as_me:9196: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+       echo "$as_me:9966: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++       echo "$as_me:9840: 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
-@@ -9201,7 +9971,7 @@
+@@ -9201,7 +9845,7 @@
    while :; do
    ac_cv_sys_largefile_source=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9204 "configure"
-+#line 9974 "configure"
++#line 9848 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -9213,16 +9983,16 @@
+@@ -9213,16 +9857,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9216: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9986: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9860: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9219: \$? = $ac_status" >&5
-+  echo "$as_me:9989: \$? = $ac_status" >&5
++  echo "$as_me:9863: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9222: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9866: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9225: \$? = $ac_status" >&5
-+  echo "$as_me:9995: \$? = $ac_status" >&5
++  echo "$as_me:9869: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -9231,7 +10001,7 @@
+@@ -9231,7 +9875,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9234 "configure"
-+#line 10004 "configure"
++#line 9878 "configure"
  #include "confdefs.h"
  #define _LARGEFILE_SOURCE 1
  #include <stdio.h>
-@@ -9244,16 +10014,16 @@
+@@ -9244,16 +9888,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9250: \$? = $ac_status" >&5
-+  echo "$as_me:10020: \$? = $ac_status" >&5
++  echo "$as_me:9894: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9253: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9897: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9256: \$? = $ac_status" >&5
-+  echo "$as_me:10026: \$? = $ac_status" >&5
++  echo "$as_me:9900: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_source=1; break
  else
-@@ -9264,7 +10034,7 @@
+@@ -9264,7 +9908,7 @@
    break
  done
  fi
 -echo "$as_me:9267: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10037: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:9911: 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
  
-@@ -9278,13 +10048,13 @@
+@@ -9278,13 +9922,13 @@
  # 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:9281: checking for fseeko" >&5
-+echo "$as_me:10051: checking for fseeko" >&5
++echo "$as_me:9925: checking for fseeko" >&5
  echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
  if test "${ac_cv_func_fseeko+set}" = set; then
@@ -18884 +21655 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9287 "configure"
-+#line 10057 "configure"
++#line 9931 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -9296,16 +10066,16 @@
+@@ -9296,16 +9940,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9299: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9943: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9302: \$? = $ac_status" >&5
-+  echo "$as_me:10072: \$? = $ac_status" >&5
++  echo "$as_me:9946: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9305: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9949: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9308: \$? = $ac_status" >&5
-+  echo "$as_me:10078: \$? = $ac_status" >&5
++  echo "$as_me:9952: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fseeko=yes
  else
-@@ -9315,7 +10085,7 @@
+@@ -9315,7 +9959,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9318: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10088: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:9962: result: $ac_cv_func_fseeko" >&5
  echo "${ECHO_T}$ac_cv_func_fseeko" >&6
  if test $ac_cv_func_fseeko = yes; then
  
-@@ -9336,14 +10106,14 @@
+@@ -9336,14 +9980,14 @@
         test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
         test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
  
 -       echo "$as_me:9339: checking whether to use struct dirent64" >&5
-+       echo "$as_me:10109: checking whether to use struct dirent64" >&5
++       echo "$as_me:9983: 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
@@ -18931 +21702 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 9346 "configure"
-+#line 10116 "configure"
++#line 9990 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -9364,16 +10134,16 @@
+@@ -9364,16 +10008,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9367: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10011: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9370: \$? = $ac_status" >&5
-+  echo "$as_me:10140: \$? = $ac_status" >&5
++  echo "$as_me:10014: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9373: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9376: \$? = $ac_status" >&5
-+  echo "$as_me:10146: \$? = $ac_status" >&5
++  echo "$as_me:10020: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_struct_dirent64=yes
  else
-@@ -9384,7 +10154,7 @@
+@@ -9384,7 +10028,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:9387: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10157: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:10031: result: $cf_cv_struct_dirent64" >&5
  echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
         test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
  #define HAVE_STRUCT_DIRENT64 1
-@@ -9393,7 +10163,7 @@
+@@ -9393,7 +10037,7 @@
      fi
  
  ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
 -echo "$as_me:9396: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10166: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:10040: 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.
-@@ -9403,14 +10173,14 @@
+@@ -9403,14 +10047,14 @@
  else
    with_tparm_varargs=yes
  fi;
 -echo "$as_me:9406: result: $with_tparm_varargs" >&5
-+echo "$as_me:10176: result: $with_tparm_varargs" >&5
++echo "$as_me:10050: result: $with_tparm_varargs" >&5
  echo "${ECHO_T}$with_tparm_varargs" >&6
  NCURSES_TPARM_VARARGS=0
@@ -18987 +21758 @@
  if test "$with_ticlib" != no ; then
 -echo "$as_me:9413: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10183: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:10057: 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.
-@@ -9420,14 +10190,14 @@
+@@ -9420,14 +10064,14 @@
  else
    with_tic_depends=yes
  fi;
 -echo "$as_me:9423: result: $with_tic_depends" >&5
-+echo "$as_me:10193: result: $with_tic_depends" >&5
++echo "$as_me:10067: result: $with_tic_depends" >&5
  echo "${ECHO_T}$with_tic_depends" >&6
  else
@@ -19004 +21775 @@
  ###   use option --with-bool to override bool's type
 -echo "$as_me:9430: checking for type of bool" >&5
-+echo "$as_me:10200: checking for type of bool" >&5
++echo "$as_me:10074: 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.
-@@ -9437,10 +10207,10 @@
+@@ -9437,10 +10081,10 @@
  else
    NCURSES_BOOL=auto
  fi;
 -echo "$as_me:9440: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10210: result: $NCURSES_BOOL" >&5
++echo "$as_me:10084: result: $NCURSES_BOOL" >&5
  echo "${ECHO_T}$NCURSES_BOOL" >&6
  
 -echo "$as_me:9443: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10213: checking for alternate terminal capabilities file" >&5
++echo "$as_me:10087: 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.
-@@ -9451,11 +10221,11 @@
+@@ -9451,11 +10095,11 @@
    TERMINFO_CAPS=Caps
  fi;
  test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
 -echo "$as_me:9454: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10224: result: $TERMINFO_CAPS" >&5
++echo "$as_me:10098: result: $TERMINFO_CAPS" >&5
  echo "${ECHO_T}$TERMINFO_CAPS" >&6
  
  ###   use option --with-chtype to override chtype's type
 -echo "$as_me:9458: checking for type of chtype" >&5
-+echo "$as_me:10228: checking for type of chtype" >&5
++echo "$as_me:10102: 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.
-@@ -9465,11 +10235,11 @@
+@@ -9465,11 +10109,11 @@
  else
    NCURSES_CHTYPE=auto
  fi;
 -echo "$as_me:9468: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10238: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:10112: result: $NCURSES_CHTYPE" >&5
  echo "${ECHO_T}$NCURSES_CHTYPE" >&6
  
  ###   use option --with-ospeed to override ospeed's type
 -echo "$as_me:9472: checking for type of ospeed" >&5
-+echo "$as_me:10242: checking for type of ospeed" >&5
++echo "$as_me:10116: 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.
-@@ -9479,11 +10249,11 @@
+@@ -9479,11 +10123,11 @@
  else
    NCURSES_OSPEED=short
  fi;
 -echo "$as_me:9482: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10252: result: $NCURSES_OSPEED" >&5
++echo "$as_me:10126: result: $NCURSES_OSPEED" >&5
  echo "${ECHO_T}$NCURSES_OSPEED" >&6
  
  ###   use option --with-mmask-t to override mmask_t's type
 -echo "$as_me:9486: checking for type of mmask_t" >&5
-+echo "$as_me:10256: checking for type of mmask_t" >&5
++echo "$as_me:10130: 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.
-@@ -9493,11 +10263,11 @@
+@@ -9493,11 +10137,11 @@
  else
    NCURSES_MMASK_T=auto
  fi;
 -echo "$as_me:9496: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10266: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:10140: result: $NCURSES_MMASK_T" >&5
  echo "${ECHO_T}$NCURSES_MMASK_T" >&6
  
  ###   use option --with-ccharw-max to override CCHARW_MAX size
 -echo "$as_me:9500: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10270: checking for size CCHARW_MAX" >&5
++echo "$as_me:10144: 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.
-@@ -9507,11 +10277,11 @@
+@@ -9507,11 +10151,25 @@
  else
    NCURSES_CCHARW_MAX=5
  fi;
 -echo "$as_me:9510: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10280: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:10154: result: $NCURSES_CCHARW_MAX" >&5
  echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
  
++###   use option --with-tparm-arg to override tparm's argument type
++echo "$as_me:10158: 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.
++if test "${with_tparm_arg+set}" = set; then
++  withval="$with_tparm_arg"
++  NCURSES_TPARM_ARG="$withval"
++else
++  NCURSES_TPARM_ARG=long
++fi;
++echo "$as_me:10168: result: $NCURSES_TPARM_ARG" >&5
++echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
++
  ### Enable compiling-in rcs id's
 -echo "$as_me:9514: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10284: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:10172: 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.
-@@ -9521,7 +10291,7 @@
+@@ -9521,7 +10179,7 @@
  else
    with_rcs_ids=no
  fi;
 -echo "$as_me:9524: result: $with_rcs_ids" >&5
-+echo "$as_me:10294: result: $with_rcs_ids" >&5
++echo "$as_me:10182: result: $with_rcs_ids" >&5
  echo "${ECHO_T}$with_rcs_ids" >&6
  test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
  #define USE_RCS_IDS 1
-@@ -9529,7 +10299,7 @@
+@@ -9529,7 +10187,7 @@
  
  ###############################################################################
  
 -echo "$as_me:9532: checking format of man-pages" >&5
-+echo "$as_me:10302: checking format of man-pages" >&5
++echo "$as_me:10190: 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.
-@@ -9618,14 +10388,14 @@
+@@ -9618,14 +10276,14 @@
    ;;
  esac
  
 -echo "$as_me:9621: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:10391: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:10279: result: $MANPAGE_FORMAT" >&5
  echo "${ECHO_T}$MANPAGE_FORMAT" >&6
  if test -n "$cf_unknown" ; then
 -  { echo "$as_me:9624: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+  { echo "$as_me:10394: WARNING: Unexpected manpage-format $cf_unknown" >&5
++  { echo "$as_me:10282: WARNING: Unexpected manpage-format $cf_unknown" >&5
  echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
  fi
  
 -echo "$as_me:9628: checking for manpage renaming" >&5
-+echo "$as_me:10398: checking for manpage renaming" >&5
++echo "$as_me:10286: 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.
-@@ -9653,7 +10423,7 @@
+@@ -9653,7 +10311,7 @@
    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:9656: error: not a filename: $MANPAGE_RENAMES" >&5
-+    { { echo "$as_me:10426: error: not a filename: $MANPAGE_RENAMES" >&5
++    { { echo "$as_me:10314: error: not a filename: $MANPAGE_RENAMES" >&5
  echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
     { (exit 1); exit 1; }; }
    fi
-@@ -9667,10 +10437,10 @@
+@@ -9667,10 +10325,10 @@
    fi
  fi
  
 -echo "$as_me:9670: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:10440: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:10328: result: $MANPAGE_RENAMES" >&5
  echo "${ECHO_T}$MANPAGE_RENAMES" >&6
  
 -echo "$as_me:9673: checking if manpage aliases will be installed" >&5
-+echo "$as_me:10443: checking if manpage aliases will be installed" >&5
++echo "$as_me:10331: 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.
-@@ -9681,7 +10451,7 @@
+@@ -9681,7 +10339,7 @@
    MANPAGE_ALIASES=yes
  fi;
  
 -echo "$as_me:9684: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:10454: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:10342: result: $MANPAGE_ALIASES" >&5
  echo "${ECHO_T}$MANPAGE_ALIASES" >&6
  
  case "x$LN_S" in #(vi
-@@ -9695,7 +10465,7 @@
+@@ -9695,7 +10353,7 @@
  
  MANPAGE_SYMLINKS=no
  if test "$MANPAGE_ALIASES" = yes ; then
 -echo "$as_me:9698: checking if manpage symlinks should be used" >&5
-+echo "$as_me:10468: checking if manpage symlinks should be used" >&5
++echo "$as_me:10356: 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.
-@@ -9708,17 +10478,17 @@
+@@ -9708,17 +10366,17 @@
  
  if test "$$cf_use_symlinks" = no; then
  if test "$MANPAGE_SYMLINKS" = yes ; then
 -       { echo "$as_me:9711: WARNING: cannot make symlinks" >&5
-+       { echo "$as_me:10481: WARNING: cannot make symlinks" >&5
++       { echo "$as_me:10369: WARNING: cannot make symlinks" >&5
  echo "$as_me: WARNING: cannot make symlinks" >&2;}
         MANPAGE_SYMLINKS=no
@@ -19179 +21964 @@
  
 -echo "$as_me:9717: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:10487: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:10375: result: $MANPAGE_SYMLINKS" >&5
  echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
  fi
  
 -echo "$as_me:9721: checking for manpage tbl" >&5
-+echo "$as_me:10491: checking for manpage tbl" >&5
++echo "$as_me:10379: 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.
-@@ -9729,7 +10499,7 @@
+@@ -9729,7 +10387,7 @@
    MANPAGE_TBL=no
  fi;
  
 -echo "$as_me:9732: result: $MANPAGE_TBL" >&5
-+echo "$as_me:10502: result: $MANPAGE_TBL" >&5
++echo "$as_me:10390: result: $MANPAGE_TBL" >&5
  echo "${ECHO_T}$MANPAGE_TBL" >&6
  
    if test "$prefix" = "NONE" ; then
-@@ -9869,7 +10639,9 @@
+@@ -9776,6 +10434,7 @@
+ # this script is generated by the configure-script CF_MAN_PAGES macro.
+ 
+ prefix="$cf_prefix"
++datarootdir="$datarootdir"
+ datadir="$datadir"
+ 
+ NCURSES_MAJOR="$NCURSES_MAJOR"
+@@ -9869,7 +10528,9 @@
  
  if test "$MANPAGE_ALIASES" != no ; then
@@ -19208 +22001 @@
  fi
  
-@@ -9915,6 +10687,13 @@
+@@ -9915,6 +10576,13 @@
  fi
  CF_EOF
@@ -19222 +22015 @@
  cat >>$cf_edit_man <<CF_EOF
         sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-@@ -10051,7 +10830,7 @@
+@@ -10051,7 +10719,7 @@
  ###############################################################################
  
  ### Note that some functions (such as const) are normally disabled anyway.
 -echo "$as_me:10054: checking if you want to build with function extensions" >&5
-+echo "$as_me:10833: checking if you want to build with function extensions" >&5
++echo "$as_me:10722: 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.
-@@ -10061,11 +10840,15 @@
+@@ -10061,11 +10729,15 @@
  else
    with_ext_funcs=yes
  fi;
 -echo "$as_me:10064: result: $with_ext_funcs" >&5
-+echo "$as_me:10843: result: $with_ext_funcs" >&5
++echo "$as_me:10732: result: $with_ext_funcs" >&5
  echo "${ECHO_T}$with_ext_funcs" >&6
  if test "$with_ext_funcs" = yes ; then
@@ -19248 +22041 @@
  EOF
  
-@@ -10090,6 +10873,14 @@
+@@ -10090,6 +10762,14 @@
  EOF
  
@@ -19263 +22056 @@
  EOF
  
-@@ -10103,7 +10894,7 @@
+@@ -10103,7 +10783,7 @@
         GENERATED_EXT_FUNCS=
  fi
  
 -echo "$as_me:10106: checking if you want to build with experimental SCREEN extensions" >&5
-+echo "$as_me:10897: checking if you want to build with experimental SCREEN extensions" >&5
++echo "$as_me:10786: checking if you want to build with experimental SCREEN extensions" >&5
  echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6
  
  # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -10113,7 +10904,7 @@
+@@ -10113,7 +10793,7 @@
  else
    with_sp_funcs=no
  fi;
 -echo "$as_me:10116: result: $with_sp_funcs" >&5
-+echo "$as_me:10907: result: $with_sp_funcs" >&5
++echo "$as_me:10796: result: $with_sp_funcs" >&5
  echo "${ECHO_T}$with_sp_funcs" >&6
  if test "$with_sp_funcs" = yes ; then
         NCURSES_SP_FUNCS=1
-@@ -10127,7 +10918,7 @@
+@@ -10127,7 +10807,7 @@
         GENERATED_SP_FUNCS=
  fi
  
 -echo "$as_me:10130: checking if you want to build with experimental terminal-driver" >&5
-+echo "$as_me:10921: checking if you want to build with experimental terminal-driver" >&5
++echo "$as_me:10810: checking if you want to build with experimental terminal-driver" >&5
  echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6
  
  # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -10137,7 +10928,7 @@
+@@ -10137,7 +10817,7 @@
  else
    with_term_driver=no
  fi;
 -echo "$as_me:10140: result: $with_term_driver" >&5
-+echo "$as_me:10931: result: $with_term_driver" >&5
++echo "$as_me:10820: result: $with_term_driver" >&5
  echo "${ECHO_T}$with_term_driver" >&6
  if test "$with_term_driver" = yes ; then
         cat >>confdefs.h <<\EOF
-@@ -10145,14 +10936,14 @@
+@@ -10145,14 +10825,14 @@
  EOF
  
         if test "$with_sp_funcs" != yes ; then
 -               { { echo "$as_me:10148: error: The term-driver option relies upon sp-funcs" >&5
-+               { { echo "$as_me:10939: error: The term-driver option relies upon sp-funcs" >&5
++               { { echo "$as_me:10828: 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; }; }
@@ -19312 +22105 @@
  ###   use option --enable-const to turn on use of const beyond that in XSI.
 -echo "$as_me:10155: checking for extended use of const keyword" >&5
-+echo "$as_me:10946: checking for extended use of const keyword" >&5
++echo "$as_me:10835: 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.
-@@ -10162,7 +10953,7 @@
+@@ -10162,7 +10842,7 @@
  else
    with_ext_const=no
  fi;
 -echo "$as_me:10165: result: $with_ext_const" >&5
-+echo "$as_me:10956: result: $with_ext_const" >&5
++echo "$as_me:10845: result: $with_ext_const" >&5
  echo "${ECHO_T}$with_ext_const" >&6
  NCURSES_CONST='/*nothing*/'
  if test "$with_ext_const" = yes ; then
-@@ -10170,7 +10961,7 @@
+@@ -10170,7 +10850,7 @@
  fi
  
  ###   use option --enable-ext-colors to turn on use of colors beyond 16.
 -echo "$as_me:10173: checking if you want to use extended colors" >&5
-+echo "$as_me:10964: checking if you want to use extended colors" >&5
++echo "$as_me:10853: 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.
-@@ -10180,12 +10971,12 @@
+@@ -10180,12 +10860,12 @@
  else
    with_ext_colors=no
  fi;
 -echo "$as_me:10183: result: $with_ext_colors" >&5
-+echo "$as_me:10974: result: $with_ext_colors" >&5
++echo "$as_me:10863: result: $with_ext_colors" >&5
  echo "${ECHO_T}$with_ext_colors" >&6
  NCURSES_EXT_COLORS=0
@@ -19345 +22138 @@
         if test "$with_widec" != yes ; then
 -               { { echo "$as_me:10188: error: This option applies only to wide-character library" >&5
-+               { { echo "$as_me:10979: error: This option applies only to wide-character library" >&5
++               { { echo "$as_me:10868: error: This option applies only to wide-character library" >&5
  echo "$as_me: error: This option applies only to wide-character library" >&2;}
     { (exit 1); exit 1; }; }
         else
-@@ -10196,7 +10987,7 @@
+@@ -10196,7 +10876,7 @@
         5.*)
                 cf_cv_rel_version=6.0
                 cf_cv_abi_version=6
 -               { echo "$as_me:10199: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+               { echo "$as_me:10990: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++               { echo "$as_me:10879: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                 ;;
         esac
-@@ -10211,7 +11002,7 @@
+@@ -10211,7 +10891,7 @@
  fi
  
  ###   use option --enable-ext-mouse to modify coding to support 5-button mice
 -echo "$as_me:10214: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11005: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:10894: 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.
-@@ -10221,7 +11012,7 @@
+@@ -10221,7 +10901,7 @@
  else
    with_ext_mouse=no
  fi;
 -echo "$as_me:10224: result: $with_ext_mouse" >&5
-+echo "$as_me:11015: result: $with_ext_mouse" >&5
++echo "$as_me:10904: result: $with_ext_mouse" >&5
  echo "${ECHO_T}$with_ext_mouse" >&6
  NCURSES_MOUSE_VERSION=1
  if test "$with_ext_mouse" = yes ; then
-@@ -10232,7 +11023,7 @@
+@@ -10232,7 +10912,7 @@
         5.*)
                 cf_cv_rel_version=6.0
                 cf_cv_abi_version=6
 -               { echo "$as_me:10235: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+               { echo "$as_me:11026: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++               { echo "$as_me:10915: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                 ;;
         esac
-@@ -10240,7 +11031,7 @@
+@@ -10240,7 +10920,7 @@
  
  fi
  
 -echo "$as_me:10243: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11034: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:10923: 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.
-@@ -10250,19 +11041,19 @@
+@@ -10250,19 +10930,19 @@
  else
    with_no_padding=$with_ext_funcs
  fi;
 -echo "$as_me:10253: result: $with_no_padding" >&5
-+echo "$as_me:11044: result: $with_no_padding" >&5
++echo "$as_me:10933: result: $with_no_padding" >&5
  echo "${ECHO_T}$with_no_padding" >&6
  test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
@@ -19406 +22199 @@
  
 -echo "$as_me:10259: checking for ANSI C header files" >&5
-+echo "$as_me:11050: checking for ANSI C header files" >&5
++echo "$as_me:10939: 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
@@ -19413 +22206 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10265 "configure"
-+#line 11056 "configure"
++#line 10945 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -10270,13 +11061,13 @@
+@@ -10270,13 +10950,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:10273: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11064: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10953: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -19429 +22222 @@
    cat conftest.err >&5
 -  echo "$as_me:10279: \$? = $ac_status" >&5
-+  echo "$as_me:11070: \$? = $ac_status" >&5
++  echo "$as_me:10959: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10298,7 +11089,7 @@
+@@ -10298,7 +10978,7 @@
  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 10301 "configure"
-+#line 11092 "configure"
++#line 10981 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -10316,7 +11107,7 @@
+@@ -10316,7 +10996,7 @@
  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 10319 "configure"
-+#line 11110 "configure"
++#line 10999 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -10337,7 +11128,7 @@
+@@ -10337,7 +11017,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10340 "configure"
-+#line 11131 "configure"
++#line 11020 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -10363,15 +11154,15 @@
+@@ -10363,15 +11043,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10366: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11046: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10369: \$? = $ac_status" >&5
-+  echo "$as_me:11160: \$? = $ac_status" >&5
++  echo "$as_me:11049: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10371: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11051: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10374: \$? = $ac_status" >&5
-+  echo "$as_me:11165: \$? = $ac_status" >&5
++  echo "$as_me:11054: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -10384,7 +11175,7 @@
+@@ -10384,7 +11064,7 @@
  fi
  fi
  fi
 -echo "$as_me:10387: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11178: result: $ac_cv_header_stdc" >&5
++echo "$as_me:11067: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -10400,28 +11191,28 @@
+@@ -10400,28 +11080,28 @@
                    inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:10403: checking for $ac_header" >&5
-+echo "$as_me:11194: checking for $ac_header" >&5
++echo "$as_me:11083: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -19501 +22294 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10409 "configure"
-+#line 11200 "configure"
++#line 11089 "configure"
  #include "confdefs.h"
  $ac_includes_default
@@ -19508 +22301 @@
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10415: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11206: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11095: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10418: \$? = $ac_status" >&5
-+  echo "$as_me:11209: \$? = $ac_status" >&5
++  echo "$as_me:11098: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10421: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11101: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10424: \$? = $ac_status" >&5
-+  echo "$as_me:11215: \$? = $ac_status" >&5
++  echo "$as_me:11104: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -10431,7 +11222,7 @@
+@@ -10431,7 +11111,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10434: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11225: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11114: 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
-@@ -10441,13 +11232,13 @@
+@@ -10441,13 +11121,13 @@
  fi
  done
  
 -echo "$as_me:10444: checking for signed char" >&5
-+echo "$as_me:11235: checking for signed char" >&5
++echo "$as_me:11124: 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
@@ -19545 +22338 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10450 "configure"
-+#line 11241 "configure"
++#line 11130 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10462,16 +11253,16 @@
+@@ -10462,16 +11142,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11256: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11145: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10468: \$? = $ac_status" >&5
-+  echo "$as_me:11259: \$? = $ac_status" >&5
++  echo "$as_me:11148: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11151: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10474: \$? = $ac_status" >&5
-+  echo "$as_me:11265: \$? = $ac_status" >&5
++  echo "$as_me:11154: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signed_char=yes
  else
-@@ -10481,10 +11272,10 @@
+@@ -10481,10 +11161,10 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10484: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:11275: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:11164: result: $ac_cv_type_signed_char" >&5
  echo "${ECHO_T}$ac_cv_type_signed_char" >&6
  
 -echo "$as_me:10487: checking size of signed char" >&5
-+echo "$as_me:11278: checking size of signed char" >&5
++echo "$as_me:11167: 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
-@@ -10493,7 +11284,7 @@
+@@ -10493,7 +11173,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10496 "configure"
-+#line 11287 "configure"
++#line 11176 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10505,21 +11296,21 @@
+@@ -10505,21 +11185,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11299: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10511: \$? = $ac_status" >&5
-+  echo "$as_me:11302: \$? = $ac_status" >&5
++  echo "$as_me:11191: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11194: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10517: \$? = $ac_status" >&5
-+  echo "$as_me:11308: \$? = $ac_status" >&5
++  echo "$as_me:11197: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=0 ac_mid=0
@@ -19615 +22408 @@
      cat >conftest.$ac_ext <<_ACEOF
 -#line 10522 "configure"
-+#line 11313 "configure"
++#line 11202 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10531,16 +11322,16 @@
+@@ -10531,16 +11211,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10534: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11214: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10537: \$? = $ac_status" >&5
-+  echo "$as_me:11328: \$? = $ac_status" >&5
++  echo "$as_me:11217: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10540: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11220: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10543: \$? = $ac_status" >&5
-+  echo "$as_me:11334: \$? = $ac_status" >&5
++  echo "$as_me:11223: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid; break
  else
-@@ -10556,7 +11347,7 @@
+@@ -10556,7 +11236,7 @@
  ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
 -#line 10559 "configure"
-+#line 11350 "configure"
++#line 11239 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10568,16 +11359,16 @@
+@@ -10568,16 +11248,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10571: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11251: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10574: \$? = $ac_status" >&5
-+  echo "$as_me:11365: \$? = $ac_status" >&5
++  echo "$as_me:11254: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10577: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11257: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10580: \$? = $ac_status" >&5
-+  echo "$as_me:11371: \$? = $ac_status" >&5
++  echo "$as_me:11260: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=$ac_mid; break
  else
-@@ -10593,7 +11384,7 @@
+@@ -10593,7 +11273,7 @@
  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 10596 "configure"
-+#line 11387 "configure"
++#line 11276 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10605,16 +11396,16 @@
+@@ -10605,16 +11285,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10608: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11288: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10611: \$? = $ac_status" >&5
-+  echo "$as_me:11402: \$? = $ac_status" >&5
++  echo "$as_me:11291: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10614: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11294: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10617: \$? = $ac_status" >&5
-+  echo "$as_me:11408: \$? = $ac_status" >&5
++  echo "$as_me:11297: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid
  else
-@@ -10627,12 +11418,12 @@
+@@ -10627,12 +11307,12 @@
  ac_cv_sizeof_signed_char=$ac_lo
  else
    if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:10630: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:11421: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:11310: 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; }; }
@@ -19711 +22504 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10635 "configure"
-+#line 11426 "configure"
++#line 11315 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10648,15 +11439,15 @@
+@@ -10648,15 +11328,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10651: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11442: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11331: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10654: \$? = $ac_status" >&5
-+  echo "$as_me:11445: \$? = $ac_status" >&5
++  echo "$as_me:11334: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11336: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10659: \$? = $ac_status" >&5
-+  echo "$as_me:11450: \$? = $ac_status" >&5
++  echo "$as_me:11339: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_signed_char=`cat conftest.val`
  else
-@@ -10672,7 +11463,7 @@
+@@ -10672,7 +11352,7 @@
    ac_cv_sizeof_signed_char=0
  fi
  fi
 -echo "$as_me:10675: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:11466: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:11355: 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
-@@ -10683,7 +11474,7 @@
+@@ -10683,7 +11363,7 @@
  else
         NCURSES_SBOOL="char"
  fi
 -echo "$as_me:10686: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:11477: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:11366: 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.
-@@ -10693,12 +11484,12 @@
+@@ -10693,12 +11373,12 @@
  else
    with_signed_char=no
  fi;
 -echo "$as_me:10696: result: $with_signed_char" >&5
-+echo "$as_me:11487: result: $with_signed_char" >&5
++echo "$as_me:11376: result: $with_signed_char" >&5
  echo "${ECHO_T}$with_signed_char" >&6
  test "$with_signed_char" != yes && NCURSES_SBOOL="char"
@@ -19764 +22557 @@
  ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 -echo "$as_me:10701: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:11492: checking if you want SIGWINCH handler" >&5
++echo "$as_me:11381: 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.
-@@ -10708,14 +11499,14 @@
+@@ -10708,14 +11388,14 @@
  else
    with_sigwinch=$with_ext_funcs
  fi;
 -echo "$as_me:10711: result: $with_sigwinch" >&5
-+echo "$as_me:11502: result: $with_sigwinch" >&5
++echo "$as_me:11391: result: $with_sigwinch" >&5
  echo "${ECHO_T}$with_sigwinch" >&6
  test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
@@ -19781 +22574 @@
  ###   use option --enable-tcap-names to allow user to define new capabilities
 -echo "$as_me:10718: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:11509: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:11398: 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.
-@@ -10725,7 +11516,7 @@
+@@ -10725,7 +11405,7 @@
  else
    with_tcap_names=$with_ext_funcs
  fi;
 -echo "$as_me:10728: result: $with_tcap_names" >&5
-+echo "$as_me:11519: result: $with_tcap_names" >&5
++echo "$as_me:11408: result: $with_tcap_names" >&5
  echo "${ECHO_T}$with_tcap_names" >&6
  NCURSES_XNAMES=0
  test "$with_tcap_names" = yes && NCURSES_XNAMES=1
-@@ -10733,7 +11524,7 @@
+@@ -10733,7 +11413,7 @@
  ###############################################################################
  # These options are relatively safe to experiment with.
  
 -echo "$as_me:10736: checking if you want all development code" >&5
-+echo "$as_me:11527: checking if you want all development code" >&5
++echo "$as_me:11416: 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.
-@@ -10743,11 +11534,11 @@
+@@ -10743,11 +11423,11 @@
  else
    with_develop=no
  fi;
 -echo "$as_me:10746: result: $with_develop" >&5
-+echo "$as_me:11537: result: $with_develop" >&5
++echo "$as_me:11426: result: $with_develop" >&5
  echo "${ECHO_T}$with_develop" >&6
  
  ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
 -echo "$as_me:10750: checking if you want hard-tabs code" >&5
-+echo "$as_me:11541: checking if you want hard-tabs code" >&5
++echo "$as_me:11430: 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.
-@@ -10757,14 +11548,14 @@
+@@ -10757,14 +11437,14 @@
  else
    enable_hard_tabs=$with_develop
  fi;
 -echo "$as_me:10760: result: $enable_hard_tabs" >&5
-+echo "$as_me:11551: result: $enable_hard_tabs" >&5
++echo "$as_me:11440: result: $enable_hard_tabs" >&5
  echo "${ECHO_T}$enable_hard_tabs" >&6
  test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
@@ -19830 +22623 @@
  ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
 -echo "$as_me:10767: checking if you want limited support for xmc" >&5
-+echo "$as_me:11558: checking if you want limited support for xmc" >&5
++echo "$as_me:11447: 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.
-@@ -10774,7 +11565,7 @@
+@@ -10774,7 +11454,7 @@
  else
    enable_xmc_glitch=$with_develop
  fi;
 -echo "$as_me:10777: result: $enable_xmc_glitch" >&5
-+echo "$as_me:11568: result: $enable_xmc_glitch" >&5
++echo "$as_me:11457: result: $enable_xmc_glitch" >&5
  echo "${ECHO_T}$enable_xmc_glitch" >&6
  test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
  #define USE_XMC_SUPPORT 1
-@@ -10783,7 +11574,7 @@
+@@ -10783,7 +11463,7 @@
  ###############################################################################
  # These are just experimental, probably should not be in a package:
  
 -echo "$as_me:10786: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:11577: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:11466: 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.
-@@ -10793,14 +11584,14 @@
+@@ -10793,14 +11473,14 @@
  else
    with_assumed_color=yes
  fi;
 -echo "$as_me:10796: result: $with_assumed_color" >&5
-+echo "$as_me:11587: result: $with_assumed_color" >&5
++echo "$as_me:11476: result: $with_assumed_color" >&5
  echo "${ECHO_T}$with_assumed_color" >&6
  test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
@@ -19865 +22658 @@
  ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
 -echo "$as_me:10803: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:11594: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:11483: 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.
-@@ -10810,14 +11601,14 @@
+@@ -10810,14 +11490,14 @@
  else
    with_hashmap=yes
  fi;
 -echo "$as_me:10813: result: $with_hashmap" >&5
-+echo "$as_me:11604: result: $with_hashmap" >&5
++echo "$as_me:11493: result: $with_hashmap" >&5
  echo "${ECHO_T}$with_hashmap" >&6
  test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
@@ -19882 +22675 @@
  ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 -echo "$as_me:10820: checking if you want colorfgbg code" >&5
-+echo "$as_me:11611: checking if you want colorfgbg code" >&5
++echo "$as_me:11500: 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.
-@@ -10827,14 +11618,14 @@
+@@ -10827,14 +11507,14 @@
  else
    with_colorfgbg=no
  fi;
 -echo "$as_me:10830: result: $with_colorfgbg" >&5
-+echo "$as_me:11621: result: $with_colorfgbg" >&5
++echo "$as_me:11510: result: $with_colorfgbg" >&5
  echo "${ECHO_T}$with_colorfgbg" >&6
  test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
@@ -19899 +22692 @@
  ###   use option --enable-interop to turn on use of bindings used for interop
 -echo "$as_me:10837: checking if you want interop bindings" >&5
-+echo "$as_me:11628: checking if you want interop bindings" >&5
++echo "$as_me:11517: 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.
-@@ -10844,7 +11635,7 @@
+@@ -10844,7 +11524,7 @@
  else
    with_exp_interop=no
  fi;
 -echo "$as_me:10847: result: $with_exp_interop" >&5
-+echo "$as_me:11638: result: $with_exp_interop" >&5
++echo "$as_me:11527: result: $with_exp_interop" >&5
  echo "${ECHO_T}$with_exp_interop" >&6
  
  NCURSES_INTEROP_FUNCS=0
-@@ -10853,7 +11644,7 @@
+@@ -10853,7 +11533,7 @@
  # This is still experimental (20080329), but should ultimately be moved to
  # the script-block --with-normal, etc.
  
 -echo "$as_me:10856: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11647: checking if you want to link with the pthread library" >&5
++echo "$as_me:11536: 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.
-@@ -10863,27 +11654,27 @@
+@@ -10863,27 +11543,27 @@
  else
    with_pthread=no
  fi;
 -echo "$as_me:10866: result: $with_pthread" >&5
-+echo "$as_me:11657: result: $with_pthread" >&5
++echo "$as_me:11546: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  
  if test "$with_pthread" != no ; then
 -    echo "$as_me:10870: checking for pthread.h" >&5
-+    echo "$as_me:11661: checking for pthread.h" >&5
++    echo "$as_me:11550: 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
@@ -19938 +22731 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10876 "configure"
-+#line 11667 "configure"
++#line 11556 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  _ACEOF
 -if { (eval echo "$as_me:10880: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11671: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11560: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -19950 +22743 @@
    cat conftest.err >&5
 -  echo "$as_me:10886: \$? = $ac_status" >&5
-+  echo "$as_me:11677: \$? = $ac_status" >&5
++  echo "$as_me:11566: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10902,7 +11693,7 @@
+@@ -10902,7 +11582,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:10905: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11696: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:11585: result: $ac_cv_header_pthread_h" >&5
  echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
  if test $ac_cv_header_pthread_h = yes; then
  
-@@ -10910,12 +11701,14 @@
+@@ -10910,12 +11590,14 @@
  #define HAVE_PTHREADS_H 1
  EOF
@@ -19975 +22768 @@
 +       for cf_lib_pthread in pthread c_r
 +       do
-+           echo "$as_me:11706: checking if we can link with the $cf_lib_pthread library" >&5
++           echo "$as_me:11595: 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"
 +           LIBS="-l$cf_lib_pthread $LIBS"
 +           cat >conftest.$ac_ext <<_ACEOF
-+#line 11711 "configure"
++#line 11600 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -10924,23 +11717,24 @@
+@@ -10924,23 +11606,24 @@
  main ()
  {
@@ -19998 +22791 @@
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10934: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11617: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10937: \$? = $ac_status" >&5
-+  echo "$as_me:11731: \$? = $ac_status" >&5
++  echo "$as_me:11620: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11623: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10943: \$? = $ac_status" >&5
-+  echo "$as_me:11737: \$? = $ac_status" >&5
++  echo "$as_me:11626: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_pthread=yes
  else
-@@ -10949,34 +11743,36 @@
+@@ -10949,34 +11632,36 @@
  with_pthread=no
  fi
@@ -20021 +22814 @@
 -        echo "$as_me:10953: result: $with_pthread" >&5
 +           LIBS="$cf_save_LIBS"
-+           echo "$as_me:11747: result: $with_pthread" >&5
++           echo "$as_me:11636: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
 +           test "$with_pthread" = yes && break
@@ -20038 +22831 @@
 -            { { echo "$as_me:10963: error: Cannot link with pthread library" >&5
 +       else
-+           { { echo "$as_me:11759: error: Cannot link with pthread library" >&5
++           { { echo "$as_me:11648: error: Cannot link with pthread library" >&5
  echo "$as_me: error: Cannot link with pthread library" >&2;}
     { (exit 1); exit 1; }; }
@@ -20050 +22843 @@
  if test "x$with_pthread" != xno; then
 -       echo "$as_me:10973: checking for pthread_kill" >&5
-+       echo "$as_me:11769: checking for pthread_kill" >&5
++       echo "$as_me:11658: 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
@@ -20057 +22850 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10979 "configure"
-+#line 11775 "configure"
++#line 11664 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char pthread_kill (); below.  */
-@@ -11007,16 +11803,16 @@
+@@ -10999,7 +11684,7 @@
+ #if defined (__stub_pthread_kill) || defined (__stub___pthread_kill)
+ choke me
+ #else
+-f = pthread_kill;
++f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -11007,16 +11692,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11010: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11806: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11695: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11013: \$? = $ac_status" >&5
-+  echo "$as_me:11809: \$? = $ac_status" >&5
++  echo "$as_me:11698: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11019: \$? = $ac_status" >&5
-+  echo "$as_me:11815: \$? = $ac_status" >&5
++  echo "$as_me:11704: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_pthread_kill=yes
  else
-@@ -11026,11 +11822,11 @@
+@@ -11026,11 +11711,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:11029: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:11825: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:11714: result: $ac_cv_func_pthread_kill" >&5
  echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
  if test $ac_cv_func_pthread_kill = yes; then
  
 -               echo "$as_me:11033: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+               echo "$as_me:11829: checking if you want to allow EINTR in wgetch with pthreads" >&5
++               echo "$as_me:11718: 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.
-@@ -11040,7 +11836,7 @@
+@@ -11040,7 +11725,7 @@
  else
    use_pthreads_eintr=no
  fi;
 -               echo "$as_me:11043: result: $use_pthreads_eintr" >&5
-+               echo "$as_me:11839: result: $use_pthreads_eintr" >&5
++               echo "$as_me:11728: result: $use_pthreads_eintr" >&5
  echo "${ECHO_T}$use_pthreads_eintr" >&6
                 if test $use_pthreads_eintr = yes ; then
                         cat >>confdefs.h <<\EOF
-@@ -11050,7 +11846,7 @@
+@@ -11050,7 +11735,7 @@
                 fi
  fi
  
 -       echo "$as_me:11053: checking if you want to use weak-symbols for pthreads" >&5
-+       echo "$as_me:11849: checking if you want to use weak-symbols for pthreads" >&5
++       echo "$as_me:11738: 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.
-@@ -11060,18 +11856,18 @@
+@@ -11060,18 +11745,18 @@
  else
    use_weak_symbols=no
  fi;
 -       echo "$as_me:11063: result: $use_weak_symbols" >&5
-+       echo "$as_me:11859: result: $use_weak_symbols" >&5
++       echo "$as_me:11748: result: $use_weak_symbols" >&5
  echo "${ECHO_T}$use_weak_symbols" >&6
         if test "$use_weak_symbols" = yes ; then
  
 -echo "$as_me:11067: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11863: checking if $CC supports weak symbols" >&5
++echo "$as_me:11752: 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
@@ -20132 +22934 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11074 "configure"
-+#line 11870 "configure"
++#line 11759 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -11097,16 +11893,16 @@
+@@ -11097,16 +11782,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11100: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11785: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11103: \$? = $ac_status" >&5
-+  echo "$as_me:11899: \$? = $ac_status" >&5
++  echo "$as_me:11788: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11791: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11109: \$? = $ac_status" >&5
-+  echo "$as_me:11905: \$? = $ac_status" >&5
++  echo "$as_me:11794: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_weak_symbols=yes
  else
-@@ -11117,7 +11913,7 @@
+@@ -11117,7 +11802,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:11120: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11916: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:11805: result: $cf_cv_weak_symbols" >&5
  echo "${ECHO_T}$cf_cv_weak_symbols" >&6
  
         else
-@@ -11148,7 +11944,7 @@
+@@ -11148,7 +11833,7 @@
  # 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:11151: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11947: checking if you want experimental reentrant code" >&5
++echo "$as_me:11836: 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.
-@@ -11158,7 +11954,7 @@
+@@ -11158,7 +11843,7 @@
  else
    with_reentrant=no
  fi;
 -echo "$as_me:11161: result: $with_reentrant" >&5
-+echo "$as_me:11957: result: $with_reentrant" >&5
++echo "$as_me:11846: result: $with_reentrant" >&5
  echo "${ECHO_T}$with_reentrant" >&6
  if test "$with_reentrant" = yes ; then
         cf_cv_enable_reentrant=1
-@@ -11184,7 +11980,7 @@
+@@ -11184,7 +11869,7 @@
         5.*)
                 cf_cv_rel_version=6.0
                 cf_cv_abi_version=6
 -               { echo "$as_me:11187: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+               { echo "$as_me:11983: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++               { echo "$as_me:11872: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                 ;;
         esac
-@@ -11199,7 +11995,7 @@
+@@ -11199,7 +11884,7 @@
  
  ### Allow using a different wrap-prefix
  if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 -       echo "$as_me:11202: checking for prefix used to wrap public variables" >&5
-+       echo "$as_me:11998: checking for prefix used to wrap public variables" >&5
++       echo "$as_me:11887: 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.
-@@ -11209,7 +12005,7 @@
+@@ -11209,7 +11894,7 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
 -       echo "$as_me:11212: result: $NCURSES_WRAP_PREFIX" >&5
-+       echo "$as_me:12008: result: $NCURSES_WRAP_PREFIX" >&5
++       echo "$as_me:11897: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  else
         NCURSES_WRAP_PREFIX=_nc_
-@@ -11219,7 +12015,7 @@
+@@ -11219,7 +11904,7 @@
  #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
  EOF
  
 -echo "$as_me:11222: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12018: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:11907: 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.
-@@ -11229,7 +12025,7 @@
+@@ -11229,7 +11914,7 @@
  else
    with_safe_sprintf=no
  fi;
 -echo "$as_me:11232: result: $with_safe_sprintf" >&5
-+echo "$as_me:12028: result: $with_safe_sprintf" >&5
++echo "$as_me:11917: result: $with_safe_sprintf" >&5
  echo "${ECHO_T}$with_safe_sprintf" >&6
  test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
  #define USE_SAFE_SPRINTF 1
-@@ -11238,7 +12034,7 @@
+@@ -11238,7 +11923,7 @@
  ###   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:11241: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12037: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:11926: 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.
-@@ -11248,7 +12044,7 @@
+@@ -11248,7 +11933,7 @@
  else
    with_scroll_hints=yes
  fi;
 -echo "$as_me:11251: result: $with_scroll_hints" >&5
-+echo "$as_me:12047: result: $with_scroll_hints" >&5
++echo "$as_me:11936: result: $with_scroll_hints" >&5
  echo "${ECHO_T}$with_scroll_hints" >&6
  test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
  #define USE_SCROLL_HINTS 1
-@@ -11256,7 +12052,7 @@
+@@ -11256,7 +11941,7 @@
  
  fi
  
 -echo "$as_me:11259: checking if you want experimental wgetch-events code" >&5
-+echo "$as_me:12055: checking if you want experimental wgetch-events code" >&5
++echo "$as_me:11944: checking if you want experimental wgetch-events code" >&5
  echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
  
  # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -11266,7 +12062,7 @@
+@@ -11266,7 +11951,7 @@
  else
    with_wgetch_events=no
  fi;
 -echo "$as_me:11269: result: $with_wgetch_events" >&5
-+echo "$as_me:12065: result: $with_wgetch_events" >&5
++echo "$as_me:11954: result: $with_wgetch_events" >&5
  echo "${ECHO_T}$with_wgetch_events" >&6
  test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
  #define NCURSES_WGETCH_EVENTS 1
-@@ -11275,7 +12071,7 @@
+@@ -11275,28 +11960,54 @@
  ###############################################################################
  
  ###    use option --disable-echo to suppress full display compiling commands
 -echo "$as_me:11278: checking if you want to display full commands during build" >&5
-+echo "$as_me:12074: checking if you want to display full commands during build" >&5
- echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
+-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
++
++echo "$as_me:11964: 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.
-@@ -11292,11 +12088,11 @@
+ if test "${enable_echo+set}" = set; then
+   enableval="$enable_echo"
+-  with_echo=$enableval
++  test "$enableval" != no && enableval=yes
++  if test "$enableval" != "yes" ; then
++
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking $@;'
++    RULE_CC='@echo compiling $<'
++    SHOW_CC='@echo compiling $@'
++    ECHO_CC='@'
++
++  else
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
++  fi
+ else
+-  with_echo=yes
++  enableval=yes
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
+ fi;
+-if test "$with_echo" = yes; then
++echo "$as_me:11998: result: $enableval" >&5
++echo "${ECHO_T}$enableval" >&6
++
++if test "$enable_echo" = yes; then
+        ECHO_LINK=
+ else
+        ECHO_LINK='@ echo linking $@ ... ;'
         test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
         test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
  fi
 -echo "$as_me:11295: result: $with_echo" >&5
-+echo "$as_me:12091: result: $with_echo" >&5
- echo "${ECHO_T}$with_echo" >&6
+-echo "${ECHO_T}$with_echo" >&6
  
  ###    use option --enable-warnings to turn on all gcc warnings
 -echo "$as_me:11299: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12095: checking if you want to see compiler warnings" >&5
++echo "$as_me:12010: 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.
-@@ -11304,7 +12100,7 @@
+@@ -11304,7 +12015,7 @@
    enableval="$enable_warnings"
    with_warnings=$enableval
  fi;
 -echo "$as_me:11307: result: $with_warnings" >&5
-+echo "$as_me:12103: result: $with_warnings" >&5
++echo "$as_me:12018: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  
  if test "x$with_warnings" = "xyes"; then
-@@ -11316,12 +12112,12 @@
+@@ -11316,12 +12027,12 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:11319: checking if this is really Intel C compiler" >&5
-+               echo "$as_me:12115: checking if this is really Intel C compiler" >&5
++               echo "$as_me:12030: 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"
@@ -20308 +23150 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 11324 "configure"
-+#line 12120 "configure"
++#line 12035 "configure"
  #include "confdefs.h"
  
  int
-@@ -11338,16 +12134,16 @@
+@@ -11338,16 +12049,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11341: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11344: \$? = $ac_status" >&5
-+  echo "$as_me:12140: \$? = $ac_status" >&5
++  echo "$as_me:12055: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11347: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12058: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11350: \$? = $ac_status" >&5
-+  echo "$as_me:12146: \$? = $ac_status" >&5
++  echo "$as_me:12061: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -11358,14 +12154,14 @@
+@@ -11357,15 +12068,64 @@
+ cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
-                CFLAGS="$cf_save_CFLAGS"
+-               CFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:11361: result: $INTEL_COMPILER" >&5
-+               echo "$as_me:12157: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
-                ;;
-        esac
+-echo "${ECHO_T}$INTEL_COMPILER" >&6
+-               ;;
+-       esac
++               CFLAGS="$cf_save_CFLAGS"
++               echo "$as_me:12072: result: $INTEL_COMPILER" >&5
++echo "${ECHO_T}$INTEL_COMPILER" >&6
++               ;;
++       esac
++fi
++
++CLANG_COMPILER=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:12081: checking if this is really Clang C compiler" >&5
++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CFLAGS"
++       CFLAGS="$CFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 12086 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __clang__
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:12103: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:12106: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:12109: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12112: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  CLANG_COMPILER=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:12123: result: $CLANG_COMPILER" >&5
++echo "${ECHO_T}$CLANG_COMPILER" >&6
  fi
  
  cat > conftest.$ac_ext <<EOF
 -#line 11368 "${as_me:-configure}"
-+#line 12164 "${as_me:-configure}"
++#line 12128 "${as_me:-configure}"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -11382,7 +12178,7 @@
+@@ -11382,7 +12142,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #279: controlling expression is constant
  
 -       { echo "$as_me:11385: checking for $CC warning options..." >&5
-+       { echo "$as_me:12181: checking for $CC warning options..." >&5
++       { echo "$as_me:12145: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS="-Wall"
-@@ -11398,12 +12194,12 @@
+@@ -11398,12 +12158,12 @@
                 wd981
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12197: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12161: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11404: \$? = $ac_status" >&5
-+  echo "$as_me:12200: \$? = $ac_status" >&5
++  echo "$as_me:12164: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11406: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12202: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12166: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                 fi
-@@ -11412,7 +12208,7 @@
+@@ -11412,7 +12172,7 @@
  
  elif test "$GCC" = yes
  then
 -       { echo "$as_me:11415: checking for $CC warning options..." >&5
-+       { echo "$as_me:12211: checking for $CC warning options..." >&5
++       { echo "$as_me:12175: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS=
-@@ -11432,12 +12228,12 @@
+@@ -11432,12 +12192,12 @@
                 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:11435: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12231: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11438: \$? = $ac_status" >&5
-+  echo "$as_me:12234: \$? = $ac_status" >&5
++  echo "$as_me:12198: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11440: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12236: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12200: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         case $cf_opt in #(vi
                         Wcast-qual) #(vi
-@@ -11448,7 +12244,7 @@
+@@ -11448,7 +12208,17 @@
                                 [34].*)
                                         test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
  
 -echo "${as_me:-configure}:11451: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12247: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:12211: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++
++                                       continue;;
++                               esac
++                               ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [12].*)
++                                       test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
++
++echo "${as_me:-configure}:12221: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
                                         continue;;
                                 esac
-@@ -11468,12 +12264,12 @@
+@@ -11468,12 +12238,12 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:11471: checking if this is really Intel C++ compiler" >&5
-+               echo "$as_me:12267: checking if this is really Intel C++ compiler" >&5
++               echo "$as_me:12241: 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"
@@ -20420 +23326 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 11476 "configure"
-+#line 12272 "configure"
++#line 12246 "configure"
  #include "confdefs.h"
  
  int
-@@ -11490,16 +12286,16 @@
+@@ -11490,16 +12260,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11493: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12263: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11496: \$? = $ac_status" >&5
-+  echo "$as_me:12292: \$? = $ac_status" >&5
++  echo "$as_me:12266: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12269: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11502: \$? = $ac_status" >&5
-+  echo "$as_me:12298: \$? = $ac_status" >&5
++  echo "$as_me:12272: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_CPLUSPLUS=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -11510,7 +12306,7 @@
+@@ -11510,12 +12280,61 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 CXXFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:11513: result: $INTEL_CPLUSPLUS" >&5
-+               echo "$as_me:12309: result: $INTEL_CPLUSPLUS" >&5
++               echo "$as_me:12283: result: $INTEL_CPLUSPLUS" >&5
  echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                 ;;
         esac
-@@ -11524,7 +12320,7 @@
+ fi
+ 
++CLANG_CPLUSPLUS=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:12292: checking if this is really Clang C++ compiler" >&5
++echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CXXFLAGS"
++       CXXFLAGS="$CXXFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 12297 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __clang__
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:12314: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:12317: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:12320: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12323: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  CLANG_CPLUSPLUS=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CXXFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:12334: result: $CLANG_CPLUSPLUS" >&5
++echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
++fi
++
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -11524,7 +12343,7 @@
  ac_main_return=return
  
  cat > conftest.$ac_ext <<EOF
 -#line 11527 "configure"
-+#line 12323 "configure"
++#line 12346 "configure"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -11542,7 +12338,7 @@
+@@ -11542,7 +12361,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #269: invalid format string conversion
  
 -       { echo "$as_me:11545: checking for $CC warning options..." >&5
-+       { echo "$as_me:12341: checking for $CC warning options..." >&5
++       { echo "$as_me:12364: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CXXFLAGS="$CXXFLAGS"
         EXTRA_CXXFLAGS="-Wall"
-@@ -11559,12 +12355,12 @@
+@@ -11559,12 +12378,12 @@
                 wd981
         do
                 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:11562: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12358: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11565: \$? = $ac_status" >&5
-+  echo "$as_me:12361: \$? = $ac_status" >&5
++  echo "$as_me:12384: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11567: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12363: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12386: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                 fi
-@@ -11573,7 +12369,7 @@
+@@ -11573,7 +12392,7 @@
  
  elif test "$GXX" = yes
  then
 -       { echo "$as_me:11576: checking for $CXX warning options..." >&5
-+       { echo "$as_me:12372: checking for $CXX warning options..." >&5
++       { echo "$as_me:12395: checking for $CXX warning options..." >&5
  echo "$as_me: checking for $CXX warning options..." >&6;}
         cf_save_CXXFLAGS="$CXXFLAGS"
         EXTRA_CXXFLAGS="-W -Wall"
-@@ -11602,16 +12398,16 @@
+@@ -11602,16 +12421,16 @@
                 Wundef $cf_gxx_extra_warnings Wno-unused
         do
                 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
 -               if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12401: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12424: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11608: \$? = $ac_status" >&5
-+  echo "$as_me:12404: \$? = $ac_status" >&5
++  echo "$as_me:12427: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11610: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12406: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12429: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                 else
 -                       test -n "$verbose" && echo "$as_me:11614: result: ... no -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12410: result: ... no -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12433: result: ... no -$cf_opt" >&5
  echo "${ECHO_T}... no -$cf_opt" >&6
                 fi
         done
-@@ -11647,10 +12443,10 @@
+@@ -11647,10 +12466,10 @@
  EOF
  if test "$GCC" = yes
  then
 -       { echo "$as_me:11650: checking for $CC __attribute__ directives..." >&5
-+       { echo "$as_me:12446: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:12469: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <<EOF
 -#line 11653 "${as_me:-configure}"
-+#line 12449 "${as_me:-configure}"
++#line 12472 "${as_me:-configure}"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
-@@ -11699,12 +12495,12 @@
+@@ -11699,12 +12518,12 @@
                         ;;
                 esac
  
 -               if { (eval echo "$as_me:11702: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12521: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11705: \$? = $ac_status" >&5
-+  echo "$as_me:12501: \$? = $ac_status" >&5
++  echo "$as_me:12524: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11707: result: ... $cf_attribute" >&5
-+                       test -n "$verbose" && echo "$as_me:12503: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:12526: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
                         cat conftest.h >>confdefs.h
                         case $cf_attribute in #(vi
-@@ -11740,7 +12536,7 @@
- fi
- 
+@@ -11739,8 +12558,100 @@
+ rm -rf conftest*
+ fi
+ 
++echo "$as_me:12561: 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"
++  with_string_hacks=$enableval
++else
++  with_string_hacks=no
++fi;
++echo "$as_me:12571: result: $with_string_hacks" >&5
++echo "${ECHO_T}$with_string_hacks" >&6
++
++if test "x$with_string_hacks" = "xyes"; then
++       cat >>confdefs.h <<\EOF
++#define USE_STRING_HACKS 1
++EOF
++
++       { echo "$as_me:12579: 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;}
++
++for ac_func in strlcat strlcpy snprintf
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:12585: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12591 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:12622: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:12625: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12631: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++eval "$as_ac_var=no"
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:12641: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<EOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++EOF
++
++fi
++done
++
++fi
++
  ###    use option --enable-assertions to turn on generation of assertion code
 -echo "$as_me:11743: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12539: checking if you want to enable runtime assertions" >&5
++echo "$as_me:12654: 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.
-@@ -11750,7 +12546,7 @@
+@@ -11750,16 +12661,12 @@
  else
    with_assertions=no
  fi;
 -echo "$as_me:11753: result: $with_assertions" >&5
-+echo "$as_me:12549: result: $with_assertions" >&5
++echo "$as_me:12664: result: $with_assertions" >&5
  echo "${ECHO_T}$with_assertions" >&6
  if test -n "$GCC"
  then
-@@ -11770,7 +12566,7 @@
+        if test "$with_assertions" = no
+        then
+-               cat >>confdefs.h <<\EOF
+-#define NDEBUG 1
+-EOF
+-
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+ 
+@@ -11770,7 +12677,7 @@
  
  ###    use option --disable-leaks to suppress "permanent" leaks, for testing
  
 -echo "$as_me:11773: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:12569: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:12680: 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.
-@@ -11786,7 +12582,7 @@
+@@ -11786,7 +12693,7 @@
  else
    with_dmalloc=
  fi;
 -echo "$as_me:11789: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:12585: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:12696: result: ${with_dmalloc:-no}" >&5
  echo "${ECHO_T}${with_dmalloc:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -11880,23 +12676,23 @@
+@@ -11880,23 +12787,23 @@
  esac
  
  if test "$with_dmalloc" = yes ; then
 -       echo "$as_me:11883: checking for dmalloc.h" >&5
-+       echo "$as_me:12679: checking for dmalloc.h" >&5
++       echo "$as_me:12790: 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
@@ -20595 +23657 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 11889 "configure"
-+#line 12685 "configure"
++#line 12796 "configure"
  #include "confdefs.h"
  #include <dmalloc.h>
  _ACEOF
 -if { (eval echo "$as_me:11893: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12689: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12800: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -20607 +23669 @@
    cat conftest.err >&5
 -  echo "$as_me:11899: \$? = $ac_status" >&5
-+  echo "$as_me:12695: \$? = $ac_status" >&5
++  echo "$as_me:12806: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11915,11 +12711,11 @@
+@@ -11915,11 +12822,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:11918: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:12714: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:12825: result: $ac_cv_header_dmalloc_h" >&5
  echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
  if test $ac_cv_header_dmalloc_h = yes; then
  
 -echo "$as_me:11922: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:12718: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:12829: 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
-@@ -11927,7 +12723,7 @@
+@@ -11927,7 +12834,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11930 "configure"
-+#line 12726 "configure"
++#line 12837 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11946,16 +12742,16 @@
+@@ -11946,16 +12853,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12856: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11952: \$? = $ac_status" >&5
-+  echo "$as_me:12748: \$? = $ac_status" >&5
++  echo "$as_me:12859: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11958: \$? = $ac_status" >&5
-+  echo "$as_me:12754: \$? = $ac_status" >&5
++  echo "$as_me:12865: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dmalloc_dmalloc_debug=yes
  else
-@@ -11966,7 +12762,7 @@
+@@ -11966,7 +12873,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:11969: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:12765: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:12876: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
  echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
  if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    cat >>confdefs.h <<EOF
-@@ -11981,7 +12777,7 @@
+@@ -11981,7 +12888,7 @@
  
  fi
  
 -echo "$as_me:11984: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:12780: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:12891: 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.
-@@ -11997,7 +12793,7 @@
+@@ -11997,7 +12904,7 @@
  else
    with_dbmalloc=
  fi;
 -echo "$as_me:12000: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:12796: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:12907: result: ${with_dbmalloc:-no}" >&5
  echo "${ECHO_T}${with_dbmalloc:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -12091,23 +12887,23 @@
+@@ -12091,23 +12998,23 @@
  esac
  
  if test "$with_dbmalloc" = yes ; then
 -       echo "$as_me:12094: checking for dbmalloc.h" >&5
-+       echo "$as_me:12890: checking for dbmalloc.h" >&5
++       echo "$as_me:13001: 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
@@ -20694 +23756 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12100 "configure"
-+#line 12896 "configure"
++#line 13007 "configure"
  #include "confdefs.h"
  #include <dbmalloc.h>
  _ACEOF
 -if { (eval echo "$as_me:12104: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12900: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13011: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -20706 +23768 @@
    cat conftest.err >&5
 -  echo "$as_me:12110: \$? = $ac_status" >&5
-+  echo "$as_me:12906: \$? = $ac_status" >&5
++  echo "$as_me:13017: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12126,11 +12922,11 @@
+@@ -12126,11 +13033,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:12129: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:12925: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:13036: result: $ac_cv_header_dbmalloc_h" >&5
  echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
  if test $ac_cv_header_dbmalloc_h = yes; then
  
 -echo "$as_me:12133: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:12929: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:13040: 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
-@@ -12138,7 +12934,7 @@
+@@ -12138,7 +13045,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12141 "configure"
-+#line 12937 "configure"
++#line 13048 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12157,16 +12953,16 @@
+@@ -12157,16 +13064,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13067: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12163: \$? = $ac_status" >&5
-+  echo "$as_me:12959: \$? = $ac_status" >&5
++  echo "$as_me:13070: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13073: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12169: \$? = $ac_status" >&5
-+  echo "$as_me:12965: \$? = $ac_status" >&5
++  echo "$as_me:13076: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dbmalloc_debug_malloc=yes
  else
-@@ -12177,7 +12973,7 @@
+@@ -12177,7 +13084,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12180: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:12976: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:13087: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
  echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
  if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    cat >>confdefs.h <<EOF
-@@ -12192,7 +12988,7 @@
+@@ -12192,7 +13099,7 @@
  
  fi
  
 -echo "$as_me:12195: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:12991: checking if you want to use valgrind for testing" >&5
++echo "$as_me:13102: 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.
-@@ -12208,7 +13004,7 @@
+@@ -12208,7 +13115,7 @@
  else
    with_valgrind=
  fi;
 -echo "$as_me:12211: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:13007: result: ${with_valgrind:-no}" >&5
++echo "$as_me:13118: result: ${with_valgrind:-no}" >&5
  echo "${ECHO_T}${with_valgrind:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -12301,7 +13097,7 @@
+@@ -12301,7 +13208,7 @@
         ;;
  esac
  
 -echo "$as_me:12304: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:13100: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:13211: 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.
-@@ -12311,7 +13107,7 @@
+@@ -12311,7 +13218,7 @@
  else
    : ${with_no_leaks:=no}
  fi;
 -echo "$as_me:12314: result: $with_no_leaks" >&5
-+echo "$as_me:13110: result: $with_no_leaks" >&5
++echo "$as_me:13221: result: $with_no_leaks" >&5
  echo "${ECHO_T}$with_no_leaks" >&6
  
  if test "$with_no_leaks" = yes ; then
-@@ -12360,7 +13156,7 @@
+@@ -12360,7 +13267,7 @@
         ;;
  esac
  
 -echo "$as_me:12363: checking whether to add trace feature to all models" >&5
-+echo "$as_me:13159: checking whether to add trace feature to all models" >&5
++echo "$as_me:13270: 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.
-@@ -12370,7 +13166,7 @@
+@@ -12370,7 +13277,7 @@
  else
    cf_with_trace=$cf_all_traces
  fi;
 -echo "$as_me:12373: result: $cf_with_trace" >&5
-+echo "$as_me:13169: result: $cf_with_trace" >&5
++echo "$as_me:13280: result: $cf_with_trace" >&5
  echo "${ECHO_T}$cf_with_trace" >&6
  
  if test "$cf_with_trace" = yes ; then
-@@ -12465,13 +13261,13 @@
+@@ -12465,13 +13372,13 @@
  *mingw32*) #(vi
         ;;
  *)
 -echo "$as_me:12468: checking for gettimeofday" >&5
-+echo "$as_me:13264: checking for gettimeofday" >&5
++echo "$as_me:13375: checking for gettimeofday" >&5
  echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
  if test "${ac_cv_func_gettimeofday+set}" = set; then
@@ -20829 +23891 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12474 "configure"
-+#line 13270 "configure"
++#line 13381 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettimeofday (); below.  */
-@@ -12502,16 +13298,16 @@
+@@ -12494,7 +13401,7 @@
+ #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday)
+ choke me
+ #else
+-f = gettimeofday;
++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -12502,16 +13409,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12505: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13412: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12508: \$? = $ac_status" >&5
-+  echo "$as_me:13304: \$? = $ac_status" >&5
++  echo "$as_me:13415: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12514: \$? = $ac_status" >&5
-+  echo "$as_me:13310: \$? = $ac_status" >&5
++  echo "$as_me:13421: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gettimeofday=yes
  else
-@@ -12521,7 +13317,7 @@
+@@ -12521,7 +13428,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:12524: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:13320: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:13431: result: $ac_cv_func_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
  if test $ac_cv_func_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -12530,7 +13326,7 @@
+@@ -12530,7 +13437,7 @@
  
  else
  
 -echo "$as_me:12533: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:13329: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:13440: 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
-@@ -12538,7 +13334,7 @@
+@@ -12538,7 +13445,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12541 "configure"
-+#line 13337 "configure"
++#line 13448 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12557,16 +13353,16 @@
+@@ -12557,16 +13464,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12560: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13467: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12563: \$? = $ac_status" >&5
-+  echo "$as_me:13359: \$? = $ac_status" >&5
++  echo "$as_me:13470: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13473: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12569: \$? = $ac_status" >&5
-+  echo "$as_me:13365: \$? = $ac_status" >&5
++  echo "$as_me:13476: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gettimeofday=yes
  else
-@@ -12577,7 +13373,7 @@
+@@ -12577,7 +13484,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12580: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:13376: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:13487: result: $ac_cv_lib_bsd_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
  if test $ac_cv_lib_bsd_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -12591,14 +13387,14 @@
+@@ -12591,14 +13498,14 @@
         ;;
  esac
  
 -echo "$as_me:12594: checking if -lm needed for math functions" >&5
-+echo "$as_me:13390: checking if -lm needed for math functions" >&5
++echo "$as_me:13501: 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
@@ -20924 +23995 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 12601 "configure"
-+#line 13397 "configure"
++#line 13508 "configure"
  #include "confdefs.h"
  
         #include <stdio.h>
-@@ -12613,16 +13409,16 @@
+@@ -12613,16 +13520,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12616: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13523: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12619: \$? = $ac_status" >&5
-+  echo "$as_me:13415: \$? = $ac_status" >&5
++  echo "$as_me:13526: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12622: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13529: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12625: \$? = $ac_status" >&5
-+  echo "$as_me:13421: \$? = $ac_status" >&5
++  echo "$as_me:13532: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_need_libm=no
  else
-@@ -12632,7 +13428,7 @@
+@@ -12632,7 +13539,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:12635: result: $cf_cv_need_libm" >&5
-+echo "$as_me:13431: result: $cf_cv_need_libm" >&5
++echo "$as_me:13542: result: $cf_cv_need_libm" >&5
  echo "${ECHO_T}$cf_cv_need_libm" >&6
  if test "$cf_cv_need_libm" = yes
  then
-@@ -12640,13 +13436,13 @@
+@@ -12640,13 +13547,13 @@
  fi
  
  ###    Checks for header files.
 -echo "$as_me:12643: checking for ANSI C header files" >&5
-+echo "$as_me:13439: checking for ANSI C header files" >&5
++echo "$as_me:13550: 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
@@ -20970 +24041 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12649 "configure"
-+#line 13445 "configure"
++#line 13556 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -12654,13 +13450,13 @@
+@@ -12654,13 +13561,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:12657: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13453: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13564: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -20986 +24057 @@
    cat conftest.err >&5
 -  echo "$as_me:12663: \$? = $ac_status" >&5
-+  echo "$as_me:13459: \$? = $ac_status" >&5
++  echo "$as_me:13570: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12682,7 +13478,7 @@
+@@ -12682,7 +13589,7 @@
  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 12685 "configure"
-+#line 13481 "configure"
++#line 13592 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -12700,7 +13496,7 @@
+@@ -12700,7 +13607,7 @@
  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 12703 "configure"
-+#line 13499 "configure"
++#line 13610 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -12721,7 +13517,7 @@
+@@ -12721,7 +13628,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12724 "configure"
-+#line 13520 "configure"
++#line 13631 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -12747,15 +13543,15 @@
+@@ -12747,15 +13654,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:12750: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13657: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12753: \$? = $ac_status" >&5
-+  echo "$as_me:13549: \$? = $ac_status" >&5
++  echo "$as_me:13660: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:12755: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12758: \$? = $ac_status" >&5
-+  echo "$as_me:13554: \$? = $ac_status" >&5
++  echo "$as_me:13665: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12768,7 +13564,7 @@
+@@ -12768,7 +13675,7 @@
  fi
  fi
  fi
 -echo "$as_me:12771: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13567: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13678: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -12781,13 +13577,13 @@
+@@ -12781,13 +13688,13 @@
  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:12784: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:13580: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:13691: 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
@@ -21058 +24129 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12790 "configure"
-+#line 13586 "configure"
++#line 13697 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -12802,16 +13598,16 @@
+@@ -12802,16 +13709,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12808: \$? = $ac_status" >&5
-+  echo "$as_me:13604: \$? = $ac_status" >&5
++  echo "$as_me:13715: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12814: \$? = $ac_status" >&5
-+  echo "$as_me:13610: \$? = $ac_status" >&5
++  echo "$as_me:13721: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -12821,7 +13617,7 @@
+@@ -12821,7 +13728,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:12824: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13620: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13731: 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
-@@ -12834,7 +13630,7 @@
+@@ -12834,7 +13741,7 @@
  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:12837: checking for opendir in -ldir" >&5
-+  echo "$as_me:13633: checking for opendir in -ldir" >&5
++  echo "$as_me:13744: 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
-@@ -12842,7 +13638,7 @@
+@@ -12842,7 +13749,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldir  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12845 "configure"
-+#line 13641 "configure"
++#line 13752 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12861,16 +13657,16 @@
+@@ -12861,16 +13768,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12864: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13771: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12867: \$? = $ac_status" >&5
-+  echo "$as_me:13663: \$? = $ac_status" >&5
++  echo "$as_me:13774: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12870: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13777: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12873: \$? = $ac_status" >&5
-+  echo "$as_me:13669: \$? = $ac_status" >&5
++  echo "$as_me:13780: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dir_opendir=yes
  else
-@@ -12881,14 +13677,14 @@
+@@ -12881,14 +13788,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12884: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:13680: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:13791: result: $ac_cv_lib_dir_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
  if test $ac_cv_lib_dir_opendir = yes; then
@@ -21144 +24215 @@
  else
 -  echo "$as_me:12891: checking for opendir in -lx" >&5
-+  echo "$as_me:13687: checking for opendir in -lx" >&5
++  echo "$as_me:13798: 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
-@@ -12896,7 +13692,7 @@
+@@ -12896,7 +13803,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lx  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12899 "configure"
-+#line 13695 "configure"
++#line 13806 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12915,16 +13711,16 @@
+@@ -12915,16 +13822,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12918: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13714: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13825: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12921: \$? = $ac_status" >&5
-+  echo "$as_me:13717: \$? = $ac_status" >&5
++  echo "$as_me:13828: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13831: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12927: \$? = $ac_status" >&5
-+  echo "$as_me:13723: \$? = $ac_status" >&5
++  echo "$as_me:13834: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_x_opendir=yes
  else
-@@ -12935,7 +13731,7 @@
+@@ -12935,7 +13842,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12938: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:13734: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:13845: result: $ac_cv_lib_x_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
  if test $ac_cv_lib_x_opendir = yes; then
    LIBS="$LIBS -lx"
-@@ -12943,13 +13739,13 @@
+@@ -12943,13 +13850,13 @@
  
  fi
  
 -echo "$as_me:12946: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13742: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:13853: 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
@@ -21199 +24270 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12952 "configure"
-+#line 13748 "configure"
++#line 13859 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -12965,16 +13761,16 @@
+@@ -12965,16 +13872,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13764: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12971: \$? = $ac_status" >&5
-+  echo "$as_me:13767: \$? = $ac_status" >&5
++  echo "$as_me:13878: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12977: \$? = $ac_status" >&5
-+  echo "$as_me:13773: \$? = $ac_status" >&5
++  echo "$as_me:13884: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -12984,7 +13780,7 @@
+@@ -12984,7 +13891,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:12987: result: $ac_cv_header_time" >&5
-+echo "$as_me:13783: result: $ac_cv_header_time" >&5
++echo "$as_me:13894: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -12999,17 +13795,17 @@
+@@ -12999,17 +13906,17 @@
  cf_regex_libs="regex re"
  case $host_os in #(vi
@@ -21243 +24314 @@
  
 -echo "$as_me:13006: checking for regcomp" >&5
-+echo "$as_me:13802: checking for regcomp" >&5
++echo "$as_me:13913: checking for regcomp" >&5
  echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
  if test "${ac_cv_func_regcomp+set}" = set; then
@@ -21250 +24321 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13012 "configure"
-+#line 13808 "configure"
++#line 13919 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char regcomp (); below.  */
-@@ -13040,16 +13836,16 @@
+@@ -13032,7 +13939,7 @@
+ #if defined (__stub_regcomp) || defined (__stub___regcomp)
+ choke me
+ #else
+-f = regcomp;
++f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -13040,16 +13947,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13043: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13950: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13046: \$? = $ac_status" >&5
-+  echo "$as_me:13842: \$? = $ac_status" >&5
++  echo "$as_me:13953: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13956: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13052: \$? = $ac_status" >&5
-+  echo "$as_me:13848: \$? = $ac_status" >&5
++  echo "$as_me:13959: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_regcomp=yes
  else
-@@ -13059,7 +13855,7 @@
+@@ -13059,7 +13966,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:13062: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:13858: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:13969: result: $ac_cv_func_regcomp" >&5
  echo "${ECHO_T}$ac_cv_func_regcomp" >&6
  if test $ac_cv_func_regcomp = yes; then
    cf_regex_func=regcomp
-@@ -13068,7 +13864,7 @@
+@@ -13068,7 +13975,7 @@
         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:13071: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:13867: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:13978: 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
-@@ -13076,7 +13872,7 @@
+@@ -13076,7 +13983,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_regex_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13079 "configure"
-+#line 13875 "configure"
++#line 13986 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13095,16 +13891,16 @@
+@@ -13095,16 +14002,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14005: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13101: \$? = $ac_status" >&5
-+  echo "$as_me:13897: \$? = $ac_status" >&5
++  echo "$as_me:14008: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13107: \$? = $ac_status" >&5
-+  echo "$as_me:13903: \$? = $ac_status" >&5
++  echo "$as_me:14014: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -13115,7 +13911,7 @@
+@@ -13115,7 +14022,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13118: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13914: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:14025: 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
  
-@@ -13129,13 +13925,13 @@
+@@ -13129,13 +14036,13 @@
  fi
  
  if test "$cf_regex_func" = no ; then
 -       echo "$as_me:13132: checking for compile" >&5
-+       echo "$as_me:13928: checking for compile" >&5
++       echo "$as_me:14039: checking for compile" >&5
  echo $ECHO_N "checking for compile... $ECHO_C" >&6
  if test "${ac_cv_func_compile+set}" = set; then
@@ -21344 +24424 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13138 "configure"
-+#line 13934 "configure"
++#line 14045 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char compile (); below.  */
-@@ -13166,16 +13962,16 @@
+@@ -13158,7 +14065,7 @@
+ #if defined (__stub_compile) || defined (__stub___compile)
+ choke me
+ #else
+-f = compile;
++f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -13166,16 +14073,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13169: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13965: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14076: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13172: \$? = $ac_status" >&5
-+  echo "$as_me:13968: \$? = $ac_status" >&5
++  echo "$as_me:14079: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13175: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14082: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13178: \$? = $ac_status" >&5
-+  echo "$as_me:13974: \$? = $ac_status" >&5
++  echo "$as_me:14085: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_compile=yes
  else
-@@ -13185,13 +13981,13 @@
+@@ -13185,13 +14092,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:13188: result: $ac_cv_func_compile" >&5
-+echo "$as_me:13984: result: $ac_cv_func_compile" >&5
++echo "$as_me:14095: result: $ac_cv_func_compile" >&5
  echo "${ECHO_T}$ac_cv_func_compile" >&6
  if test $ac_cv_func_compile = yes; then
@@ -21381 +24470 @@
  
 -               echo "$as_me:13194: checking for compile in -lgen" >&5
-+               echo "$as_me:13990: checking for compile in -lgen" >&5
++               echo "$as_me:14101: 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
-@@ -13199,7 +13995,7 @@
+@@ -13199,7 +14106,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgen  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13202 "configure"
-+#line 13998 "configure"
++#line 14109 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13218,16 +14014,16 @@
+@@ -13218,16 +14125,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13221: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13224: \$? = $ac_status" >&5
-+  echo "$as_me:14020: \$? = $ac_status" >&5
++  echo "$as_me:14131: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14134: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13230: \$? = $ac_status" >&5
-+  echo "$as_me:14026: \$? = $ac_status" >&5
++  echo "$as_me:14137: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gen_compile=yes
  else
-@@ -13238,7 +14034,7 @@
+@@ -13238,7 +14145,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13241: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:14037: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:14148: result: $ac_cv_lib_gen_compile" >&5
  echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
  if test $ac_cv_lib_gen_compile = yes; then
  
-@@ -13251,11 +14047,11 @@
+@@ -13251,11 +14158,11 @@
  fi
  
  if test "$cf_regex_func" = no ; then
 -       { echo "$as_me:13254: WARNING: cannot find regular expression library" >&5
-+       { echo "$as_me:14050: WARNING: cannot find regular expression library" >&5
++       { echo "$as_me:14161: WARNING: cannot find regular expression library" >&5
  echo "$as_me: WARNING: cannot find regular expression library" >&2;}
  fi
  
 -echo "$as_me:13258: checking for regular-expression headers" >&5
-+echo "$as_me:14054: checking for regular-expression headers" >&5
++echo "$as_me:14165: 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
-@@ -13267,7 +14063,7 @@
+@@ -13267,7 +14174,7 @@
         for cf_regex_hdr in regexp.h regexpr.h
         do
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 13270 "configure"
-+#line 14066 "configure"
++#line 14177 "configure"
  #include "confdefs.h"
  #include <$cf_regex_hdr>
  int
-@@ -13282,16 +14078,16 @@
+@@ -13282,16 +14189,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13285: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14081: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14192: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13288: \$? = $ac_status" >&5
-+  echo "$as_me:14084: \$? = $ac_status" >&5
++  echo "$as_me:14195: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13291: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14198: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13294: \$? = $ac_status" >&5
-+  echo "$as_me:14090: \$? = $ac_status" >&5
++  echo "$as_me:14201: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                         cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -13308,7 +14104,7 @@
+@@ -13308,7 +14215,7 @@
         for cf_regex_hdr in regex.h
         do
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 13311 "configure"
-+#line 14107 "configure"
++#line 14218 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$cf_regex_hdr>
-@@ -13326,16 +14122,16 @@
+@@ -13326,16 +14233,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13329: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14236: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13332: \$? = $ac_status" >&5
-+  echo "$as_me:14128: \$? = $ac_status" >&5
++  echo "$as_me:14239: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14242: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13338: \$? = $ac_status" >&5
-+  echo "$as_me:14134: \$? = $ac_status" >&5
++  echo "$as_me:14245: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                         cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -13351,11 +14147,11 @@
+@@ -13351,11 +14258,11 @@
  esac
  
  fi
 -echo "$as_me:13354: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:14150: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:14261: result: $cf_cv_regex_hdrs" >&5
  echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
  
  case $cf_cv_regex_hdrs in #(vi
 -    no)               { echo "$as_me:13358: WARNING: no regular expression header found" >&5
-+    no)               { echo "$as_me:14154: WARNING: no regular expression header found" >&5
++    no)               { echo "$as_me:14265: WARNING: no regular expression header found" >&5
  echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi
      regex.h)   cat >>confdefs.h <<\EOF
  #define HAVE_REGEX_H_FUNCS 1
-@@ -13391,23 +14187,71 @@
+@@ -13391,23 +14298,71 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:13394: checking for $ac_header" >&5
-+echo "$as_me:14190: checking for $ac_header" >&5
++echo "$as_me:14301: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -21523 +24612 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 14196 "configure"
++#line 14307 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:14200: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14311: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -21533 +24622 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:14206: \$? = $ac_status" >&5
++  echo "$as_me:14317: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -21552 +24641 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:14225: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14336: 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
@@ -21565 +24654 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:14238: checking for $ac_header" >&5
++echo "$as_me:14349: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -21572 +24661 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13400 "configure"
-+#line 14244 "configure"
++#line 14355 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:13404: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14248: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14359: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -21584 +24673 @@
    cat conftest.err >&5
 -  echo "$as_me:13410: \$? = $ac_status" >&5
-+  echo "$as_me:14254: \$? = $ac_status" >&5
++  echo "$as_me:14365: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13426,7 +14270,7 @@
+@@ -13426,7 +14381,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:13429: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14273: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14384: 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
-@@ -13436,11 +14280,64 @@
+@@ -13436,11 +14391,64 @@
  fi
  done
  
-+echo "$as_me:14283: checking for header declaring getopt variables" >&5
++echo "$as_me:14394: 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
@@ -21611 +24700 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 14293 "configure"
++#line 14404 "configure"
 +#include "confdefs.h"
 +
@@ -21624 +24713 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14417: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14309: \$? = $ac_status" >&5
++  echo "$as_me:14420: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14423: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14315: \$? = $ac_status" >&5
++  echo "$as_me:14426: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_getopt_header=$cf_header
@@ -21645 +24734 @@
 +
 +fi
-+echo "$as_me:14327: result: $cf_cv_getopt_header" >&5
++echo "$as_me:14438: result: $cf_cv_getopt_header" >&5
 +echo "${ECHO_T}$cf_cv_getopt_header" >&6
 +if test $cf_cv_getopt_header != none ; then
@@ -21659 +24748 @@
  
 -echo "$as_me:13443: checking for main in -lcposix" >&5
-+echo "$as_me:14340: checking for main in -lcposix" >&5
++echo "$as_me:14451: checking for main in -lcposix" >&5
  echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
  if test "${ac_cv_lib_cposix_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13448,7 +14345,7 @@
+@@ -13448,7 +14456,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13451 "configure"
-+#line 14348 "configure"
++#line 14459 "configure"
  #include "confdefs.h"
  
  int
-@@ -13460,16 +14357,16 @@
+@@ -13460,16 +14468,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13466: \$? = $ac_status" >&5
-+  echo "$as_me:14363: \$? = $ac_status" >&5
++  echo "$as_me:14474: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13469: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14477: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13472: \$? = $ac_status" >&5
-+  echo "$as_me:14369: \$? = $ac_status" >&5
++  echo "$as_me:14480: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_cposix_main=yes
  else
-@@ -13480,7 +14377,7 @@
+@@ -13480,7 +14488,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13483: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:14380: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:14491: result: $ac_cv_lib_cposix_main" >&5
  echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
  if test $ac_cv_lib_cposix_main = yes; then
    cat >>confdefs.h <<EOF
-@@ -13491,7 +14388,7 @@
+@@ -13491,7 +14499,7 @@
  
  fi
  
 -       echo "$as_me:13494: checking for bzero in -linet" >&5
-+       echo "$as_me:14391: checking for bzero in -linet" >&5
++       echo "$as_me:14502: checking for bzero in -linet" >&5
  echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
  if test "${ac_cv_lib_inet_bzero+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13499,7 +14396,7 @@
+@@ -13499,7 +14507,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-linet  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13502 "configure"
-+#line 14399 "configure"
++#line 14510 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13518,16 +14415,16 @@
+@@ -13518,16 +14526,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14418: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14529: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13524: \$? = $ac_status" >&5
-+  echo "$as_me:14421: \$? = $ac_status" >&5
++  echo "$as_me:14532: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13530: \$? = $ac_status" >&5
-+  echo "$as_me:14427: \$? = $ac_status" >&5
++  echo "$as_me:14538: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_inet_bzero=yes
  else
-@@ -13538,21 +14435,21 @@
+@@ -13538,21 +14546,21 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13541: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:14438: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:14549: result: $ac_cv_lib_inet_bzero" >&5
  echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
  if test $ac_cv_lib_inet_bzero = yes; then
@@ -21754 +24843 @@
  
 -echo "$as_me:13548: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:14445: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:14556: 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
@@ -21762 +24851 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13555 "configure"
-+#line 14452 "configure"
++#line 14563 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -13572,16 +14469,16 @@
+@@ -13572,16 +14580,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13578: \$? = $ac_status" >&5
-+  echo "$as_me:14475: \$? = $ac_status" >&5
++  echo "$as_me:14586: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13584: \$? = $ac_status" >&5
-+  echo "$as_me:14481: \$? = $ac_status" >&5
++  echo "$as_me:14592: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sys_time_select=yes
  else
-@@ -13593,7 +14490,7 @@
+@@ -13593,7 +14601,7 @@
  
  fi
  
 -echo "$as_me:13596: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:14493: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:14604: result: $cf_cv_sys_time_select" >&5
  echo "${ECHO_T}$cf_cv_sys_time_select" >&6
  test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
  #define HAVE_SYS_TIME_SELECT 1
-@@ -13607,7 +14504,7 @@
+@@ -13607,7 +14615,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
  
 -echo "$as_me:13610: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:14507: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:14618: 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
-@@ -13615,7 +14512,7 @@
+@@ -13615,7 +14623,7 @@
    ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13618 "configure"
-+#line 14515 "configure"
++#line 14626 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
-@@ -13664,16 +14561,16 @@
+@@ -13664,16 +14672,16 @@
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13667: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13670: \$? = $ac_status" >&5
-+  echo "$as_me:14567: \$? = $ac_status" >&5
++  echo "$as_me:14678: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13673: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13676: \$? = $ac_status" >&5
-+  echo "$as_me:14573: \$? = $ac_status" >&5
++  echo "$as_me:14684: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_stdc=$ac_arg
  break
-@@ -13690,21 +14587,21 @@
+@@ -13690,21 +14698,21 @@
  
  case "x$ac_cv_prog_cc_stdc" in
    x|xno)
 -    echo "$as_me:13693: result: none needed" >&5
-+    echo "$as_me:14590: result: none needed" >&5
++    echo "$as_me:14701: result: none needed" >&5
  echo "${ECHO_T}none needed" >&6 ;;
    *)
 -    echo "$as_me:13696: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:14593: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:14704: result: $ac_cv_prog_cc_stdc" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
      CC="$CC $ac_cv_prog_cc_stdc" ;;
@@ -21850 +24939 @@
  
 -echo "$as_me:13701: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:14598: checking for an ANSI C-conforming const" >&5
++echo "$as_me:14709: 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
@@ -21857 +24946 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13707 "configure"
-+#line 14604 "configure"
++#line 14715 "configure"
  #include "confdefs.h"
  
  int
-@@ -13762,16 +14659,16 @@
+@@ -13762,16 +14770,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14773: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13768: \$? = $ac_status" >&5
-+  echo "$as_me:14665: \$? = $ac_status" >&5
++  echo "$as_me:14776: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14779: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13774: \$? = $ac_status" >&5
-+  echo "$as_me:14671: \$? = $ac_status" >&5
++  echo "$as_me:14782: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -13781,7 +14678,7 @@
+@@ -13781,7 +14789,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:13784: result: $ac_cv_c_const" >&5
-+echo "$as_me:14681: result: $ac_cv_c_const" >&5
++echo "$as_me:14792: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -13791,7 +14688,7 @@
+@@ -13791,7 +14799,7 @@
  
  fi
  
 -echo "$as_me:13794: checking for inline" >&5
-+echo "$as_me:14691: checking for inline" >&5
++echo "$as_me:14802: 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
-@@ -13799,7 +14696,7 @@
+@@ -13799,7 +14807,7 @@
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13802 "configure"
-+#line 14699 "configure"
++#line 14810 "configure"
  #include "confdefs.h"
  #ifndef __cplusplus
  static $ac_kw int static_foo () {return 0; }
-@@ -13808,16 +14705,16 @@
+@@ -13808,16 +14816,16 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13811: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14819: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13814: \$? = $ac_status" >&5
-+  echo "$as_me:14711: \$? = $ac_status" >&5
++  echo "$as_me:14822: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13817: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14825: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13820: \$? = $ac_status" >&5
-+  echo "$as_me:14717: \$? = $ac_status" >&5
++  echo "$as_me:14828: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -13828,7 +14725,7 @@
+@@ -13828,7 +14836,7 @@
  done
  
  fi
 -echo "$as_me:13831: result: $ac_cv_c_inline" >&5
-+echo "$as_me:14728: result: $ac_cv_c_inline" >&5
++echo "$as_me:14839: result: $ac_cv_c_inline" >&5
  echo "${ECHO_T}$ac_cv_c_inline" >&6
  case $ac_cv_c_inline in
    inline | yes) ;;
-@@ -13851,7 +14748,7 @@
+@@ -13849,9 +14857,12 @@
+   if test "$INTEL_COMPILER" = yes
+   then
      :
++  elif test "$CLANG_COMPILER" = yes
++  then
++    :
    elif test "$GCC" = yes
    then
 -    echo "$as_me:13854: checking if $CC supports options to tune inlining" >&5
-+    echo "$as_me:14751: checking if $CC supports options to tune inlining" >&5
++    echo "$as_me:14865: 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
-@@ -13860,7 +14757,7 @@
+@@ -13860,7 +14871,7 @@
        cf_save_CFLAGS=$CFLAGS
        CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
        cat >conftest.$ac_ext <<_ACEOF
 -#line 13863 "configure"
-+#line 14760 "configure"
++#line 14874 "configure"
  #include "confdefs.h"
  inline int foo(void) { return 1; }
  int
-@@ -13872,16 +14769,16 @@
+@@ -13872,16 +14883,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14772: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14886: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13878: \$? = $ac_status" >&5
-+  echo "$as_me:14775: \$? = $ac_status" >&5
++  echo "$as_me:14889: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14892: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13884: \$? = $ac_status" >&5
-+  echo "$as_me:14781: \$? = $ac_status" >&5
++  echo "$as_me:14895: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gcc_inline=yes
  else
-@@ -13893,7 +14790,7 @@
+@@ -13893,7 +14904,7 @@
        CFLAGS=$cf_save_CFLAGS
  
  fi
 -echo "$as_me:13896: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:14793: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:14907: result: $cf_cv_gcc_inline" >&5
  echo "${ECHO_T}$cf_cv_gcc_inline" >&6
      if test "$cf_cv_gcc_inline" = yes ; then
  
-@@ -13979,7 +14876,7 @@
+@@ -13979,7 +14990,7 @@
    fi
  fi
  
 -echo "$as_me:13982: checking for signal global datatype" >&5
-+echo "$as_me:14879: checking for signal global datatype" >&5
++echo "$as_me:14993: 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
-@@ -13991,7 +14888,7 @@
+@@ -13991,7 +15002,7 @@
                 "int"
         do
         cat >conftest.$ac_ext <<_ACEOF
 -#line 13994 "configure"
-+#line 14891 "configure"
++#line 15005 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -14014,16 +14911,16 @@
+@@ -14014,16 +15025,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15028: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14020: \$? = $ac_status" >&5
-+  echo "$as_me:14917: \$? = $ac_status" >&5
++  echo "$as_me:15031: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15034: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14026: \$? = $ac_status" >&5
-+  echo "$as_me:14923: \$? = $ac_status" >&5
++  echo "$as_me:15037: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sig_atomic_t=$cf_type
  else
-@@ -14037,7 +14934,7 @@
+@@ -14037,7 +15048,7 @@
  
  fi
  
 -echo "$as_me:14040: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:14937: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:15051: 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
-@@ -14045,7 +14942,7 @@
+@@ -14045,7 +15056,7 @@
  
  if test $NCURSES_CHTYPE = auto ; then
  
 -echo "$as_me:14048: checking for type of chtype" >&5
-+echo "$as_me:14945: checking for type of chtype" >&5
++echo "$as_me:15059: 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
-@@ -14055,7 +14952,7 @@
+@@ -14055,7 +15066,7 @@
    cf_cv_typeof_chtype=long
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14058 "configure"
-+#line 14955 "configure"
++#line 15069 "configure"
  #include "confdefs.h"
  
  #define WANT_BITS 31
-@@ -14090,15 +14987,15 @@
+@@ -14090,15 +15101,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15104: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14096: \$? = $ac_status" >&5
-+  echo "$as_me:14993: \$? = $ac_status" >&5
++  echo "$as_me:15107: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14101: \$? = $ac_status" >&5
-+  echo "$as_me:14998: \$? = $ac_status" >&5
++  echo "$as_me:15112: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_typeof_chtype=`cat cf_test.out`
  else
-@@ -14113,7 +15010,7 @@
+@@ -14113,7 +15124,7 @@
  
  fi
  
 -echo "$as_me:14116: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:15013: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:15127: result: $cf_cv_typeof_chtype" >&5
  echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
  
  cat >>confdefs.h <<EOF
-@@ -14125,14 +15022,14 @@
+@@ -14125,14 +15136,14 @@
  fi
  test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
  
 -echo "$as_me:14128: checking if unsigned literals are legal" >&5
-+echo "$as_me:15025: checking if unsigned literals are legal" >&5
++echo "$as_me:15139: 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
@@ -22095 +25189 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14135 "configure"
-+#line 15032 "configure"
++#line 15146 "configure"
  #include "confdefs.h"
  
  int
-@@ -14144,16 +15041,16 @@
+@@ -14144,16 +15155,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14147: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15158: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14150: \$? = $ac_status" >&5
-+  echo "$as_me:15047: \$? = $ac_status" >&5
++  echo "$as_me:15161: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14156: \$? = $ac_status" >&5
-+  echo "$as_me:15053: \$? = $ac_status" >&5
++  echo "$as_me:15167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_unsigned_literals=yes
  else
-@@ -14165,7 +15062,7 @@
+@@ -14165,7 +15176,7 @@
  
  fi
  
 -echo "$as_me:14168: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:15065: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:15179: result: $cf_cv_unsigned_literals" >&5
  echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
  
  cf_cv_1UL="1"
-@@ -14181,14 +15078,14 @@
+@@ -14181,14 +15192,14 @@
  
  ###    Checks for external-data
  
 -echo "$as_me:14184: checking if external errno is declared" >&5
-+echo "$as_me:15081: checking if external errno is declared" >&5
++echo "$as_me:15195: 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
@@ -22142 +25236 @@
      cat >conftest.$ac_ext <<_ACEOF
 -#line 14191 "configure"
-+#line 15088 "configure"
++#line 15202 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_STDLIB_H
-@@ -14206,16 +15103,16 @@
+@@ -14206,16 +15217,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14209: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15220: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14212: \$? = $ac_status" >&5
-+  echo "$as_me:15109: \$? = $ac_status" >&5
++  echo "$as_me:15223: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14215: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14218: \$? = $ac_status" >&5
-+  echo "$as_me:15115: \$? = $ac_status" >&5
++  echo "$as_me:15229: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_dcl_errno=yes
  else
-@@ -14226,7 +15123,7 @@
+@@ -14226,7 +15237,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:14229: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:15126: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:15240: result: $cf_cv_dcl_errno" >&5
  echo "${ECHO_T}$cf_cv_dcl_errno" >&6
  
  if test "$cf_cv_dcl_errno" = no ; then
-@@ -14241,14 +15138,14 @@
+@@ -14241,14 +15252,14 @@
  
  # It's possible (for near-UNIX clones) that the data doesn't exist
  
 -echo "$as_me:14244: checking if external errno exists" >&5
-+echo "$as_me:15141: checking if external errno exists" >&5
++echo "$as_me:15255: 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
@@ -22189 +25283 @@
      cat >conftest.$ac_ext <<_ACEOF
 -#line 14251 "configure"
-+#line 15148 "configure"
++#line 15262 "configure"
  #include "confdefs.h"
  
  #undef errno
-@@ -14263,16 +15160,16 @@
+@@ -14263,16 +15274,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14266: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15277: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14269: \$? = $ac_status" >&5
-+  echo "$as_me:15166: \$? = $ac_status" >&5
++  echo "$as_me:15280: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14272: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15283: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14275: \$? = $ac_status" >&5
-+  echo "$as_me:15172: \$? = $ac_status" >&5
++  echo "$as_me:15286: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_errno=yes
  else
-@@ -14283,7 +15180,7 @@
+@@ -14283,7 +15294,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:14286: result: $cf_cv_have_errno" >&5
-+echo "$as_me:15183: result: $cf_cv_have_errno" >&5
++echo "$as_me:15297: result: $cf_cv_have_errno" >&5
  echo "${ECHO_T}$cf_cv_have_errno" >&6
  
  if test "$cf_cv_have_errno" = yes ; then
-@@ -14296,7 +15193,7 @@
+@@ -14296,7 +15307,7 @@
  
  fi
  
 -echo "$as_me:14299: checking if data-only library module links" >&5
-+echo "$as_me:15196: checking if data-only library module links" >&5
++echo "$as_me:15310: 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
-@@ -14304,20 +15201,20 @@
+@@ -14304,20 +15315,20 @@
  
         rm -f conftest.a
         cat >conftest.$ac_ext <<EOF
 -#line 14307 "configure"
-+#line 15204 "configure"
++#line 15318 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -       if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:15207: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:15321: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14313: \$? = $ac_status" >&5
-+  echo "$as_me:15210: \$? = $ac_status" >&5
++  echo "$as_me:15324: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                 mv conftest.o data.o && \
@@ -22253 +25347 @@
         cat >conftest.$ac_ext <<EOF
 -#line 14320 "configure"
-+#line 15217 "configure"
++#line 15331 "configure"
  int    testfunc()
  {
  #if defined(NeXT)
-@@ -14330,10 +15227,10 @@
+@@ -14330,10 +15341,10 @@
  #endif
  }
  EOF
 -       if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:15230: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:15344: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14336: \$? = $ac_status" >&5
-+  echo "$as_me:15233: \$? = $ac_status" >&5
++  echo "$as_me:15347: \$? = $ac_status" >&5
    (exit $ac_status); }; then
                 mv conftest.o func.o && \
                 ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -14346,7 +15243,7 @@
+@@ -14346,7 +15357,7 @@
    cf_cv_link_dataonly=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14349 "configure"
-+#line 15246 "configure"
++#line 15360 "configure"
  #include "confdefs.h"
  
         int main()
-@@ -14357,15 +15254,15 @@
+@@ -14357,15 +15368,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14360: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15371: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14363: \$? = $ac_status" >&5
-+  echo "$as_me:15260: \$? = $ac_status" >&5
++  echo "$as_me:15374: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14365: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15376: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14368: \$? = $ac_status" >&5
-+  echo "$as_me:15265: \$? = $ac_status" >&5
++  echo "$as_me:15379: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_link_dataonly=yes
  else
-@@ -14380,7 +15277,7 @@
+@@ -14380,7 +15391,7 @@
  
  fi
  
 -echo "$as_me:14383: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:15280: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:15394: result: $cf_cv_link_dataonly" >&5
  echo "${ECHO_T}$cf_cv_link_dataonly" >&6
  
  if test "$cf_cv_link_dataonly" = no ; then
-@@ -14415,13 +15312,13 @@
+@@ -14400,10 +15411,12 @@
+ getttynam \
+ issetugid \
+ poll \
++putenv \
+ remove \
+ select \
+ setbuf \
+ setbuffer \
++setenv \
+ setvbuf \
+ sigaction \
+ sigvec \
+@@ -14415,13 +15428,13 @@
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:14418: checking for $ac_func" >&5
-+echo "$as_me:15315: checking for $ac_func" >&5
++echo "$as_me:15431: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -22320 +25427 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14424 "configure"
-+#line 15321 "configure"
++#line 15437 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -14452,16 +15349,16 @@
+@@ -14444,7 +15457,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -14452,16 +15465,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14455: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15468: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14458: \$? = $ac_status" >&5
-+  echo "$as_me:15355: \$? = $ac_status" >&5
++  echo "$as_me:15471: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15474: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14464: \$? = $ac_status" >&5
-+  echo "$as_me:15361: \$? = $ac_status" >&5
++  echo "$as_me:15477: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -14471,7 +15368,7 @@
+@@ -14471,7 +15484,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:14474: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:15371: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:15487: 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
-@@ -14483,14 +15380,14 @@
+@@ -14483,14 +15496,70 @@
  
  if test "$with_getcap" = "yes" ; then
  
 -echo "$as_me:14486: checking for terminal-capability database functions" >&5
-+echo "$as_me:15383: checking for terminal-capability database functions" >&5
++echo "$as_me:15499: 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
@@ -22367 +25483 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14493 "configure"
-+#line 15390 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14501,7 +15398,7 @@
-        char temp[128];
-        char *buf = temp;
-        char *db_array = temp;
--       cgetent(&buf, /* int *, */ &db_array, "vt100");
-+       cgetent(&buf, &db_array, "vt100");
-        cgetcap(buf, "tc", '=');
-        cgetmatch(buf, "tc");
- 
-@@ -14510,16 +15407,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14513: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14516: \$? = $ac_status" >&5
-+  echo "$as_me:15413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14522: \$? = $ac_status" >&5
-+  echo "$as_me:15419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -14530,23 +15427,85 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--
--echo "$as_me:14534: result: $cf_cv_cgetent" >&5
-+echo "$as_me:15430: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
--test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
-+
-+if test "$cf_cv_cgetent" = yes
-+then
-+       cat >>confdefs.h <<\EOF
- #define HAVE_BSD_CGETENT 1
- EOF
- 
-+echo "$as_me:15439: checking if cgetent uses const parameter" >&5
-+echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
-+if test "${cf_cv_cgetent_const+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 15446 "configure"
++#line 15506 "configure"
 +#include "confdefs.h"
 +
@@ -22434 +25493 @@
 +       char temp[128];
 +       char *buf = temp;
-+#ifndef _NETBSD_SOURCE                 /* given, since April 2004 in stdlib.h */
-+       const char *db_array = temp;
++       char *db_array = temp;
 +       cgetent(&buf, &db_array, "vt100");
-+#endif
 +       cgetcap(buf, "tc", '=');
 +       cgetmatch(buf, "tc");
@@ -22446 +25503 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:15468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15526: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:15471: \$? = $ac_status" >&5
++  echo "$as_me:15529: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:15474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15532: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:15477: \$? = $ac_status" >&5
++  echo "$as_me:15535: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  cf_cv_cgetent_const=yes
++  cf_cv_cgetent=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+cf_cv_cgetent_const=no
++cf_cv_cgetent=no
 +fi
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
 +fi
-+echo "$as_me:15488: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:15546: result: $cf_cv_cgetent" >&5
++echo "${ECHO_T}$cf_cv_cgetent" >&6
++
++if test "$cf_cv_cgetent" = yes
++then
++       cat >>confdefs.h <<\EOF
++#define HAVE_BSD_CGETENT 1
++EOF
++
++echo "$as_me:15555: checking if cgetent uses const parameter" >&5
++echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
++if test "${cf_cv_cgetent_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cat >conftest.$ac_ext <<_ACEOF
++#line 15562 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14500,8 +15569,10 @@
+ 
+        char temp[128];
+        char *buf = temp;
+-       char *db_array = temp;
+-       cgetent(&buf, /* int *, */ &db_array, "vt100");
++#ifndef _NETBSD_SOURCE                 /* given, since April 2004 in stdlib.h */
++       const char *db_array = temp;
++       cgetent(&buf, &db_array, "vt100");
++#endif
+        cgetcap(buf, "tc", '=');
+        cgetmatch(buf, "tc");
+ 
+@@ -14510,43 +15581,47 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14513: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14516: \$? = $ac_status" >&5
++  echo "$as_me:15587: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14522: \$? = $ac_status" >&5
++  echo "$as_me:15593: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  cf_cv_cgetent=yes
++  cf_cv_cgetent_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_cgetent=no
++cf_cv_cgetent_const=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-
+-echo "$as_me:14534: result: $cf_cv_cgetent" >&5
+-echo "${ECHO_T}$cf_cv_cgetent" >&6
+-test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
+-#define HAVE_BSD_CGETENT 1
++echo "$as_me:15604: result: $cf_cv_cgetent_const" >&5
 +echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 +       if test "$cf_cv_cgetent_const" = yes
@@ -22472 +25597 @@
 +               cat >>confdefs.h <<EOF
 +#define CGETENT_CONST const
-+EOF
-+
+ EOF
+ 
 +       fi
 +fi
@@ -22480 +25605 @@
  
 -echo "$as_me:14542: checking for isascii" >&5
-+echo "$as_me:15501: checking for isascii" >&5
++echo "$as_me:15617: checking for isascii" >&5
  echo $ECHO_N "checking for isascii... $ECHO_C" >&6
  if test "${cf_cv_have_isascii+set}" = set; then
@@ -22488 +25613 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14549 "configure"
-+#line 15508 "configure"
++#line 15624 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  int
-@@ -14558,16 +15517,16 @@
+@@ -14558,16 +15633,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15520: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15636: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14564: \$? = $ac_status" >&5
-+  echo "$as_me:15523: \$? = $ac_status" >&5
++  echo "$as_me:15639: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15642: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14570: \$? = $ac_status" >&5
-+  echo "$as_me:15529: \$? = $ac_status" >&5
++  echo "$as_me:15645: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_isascii=yes
  else
-@@ -14578,17 +15537,17 @@
+@@ -14578,17 +15653,17 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:14581: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:15540: result: $cf_cv_have_isascii" >&5
++echo "$as_me:15656: result: $cf_cv_have_isascii" >&5
  echo "${ECHO_T}$cf_cv_have_isascii" >&6
  test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
@@ -22526 +25651 @@
  if test "$ac_cv_func_sigaction" = yes; then
 -echo "$as_me:14588: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:15547: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:15663: checking whether sigaction needs _POSIX_SOURCE" >&5
  echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14591 "configure"
-+#line 15550 "configure"
++#line 15666 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -14602,16 +15561,16 @@
+@@ -14602,16 +15677,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15680: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14608: \$? = $ac_status" >&5
-+  echo "$as_me:15567: \$? = $ac_status" >&5
++  echo "$as_me:15683: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15686: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14614: \$? = $ac_status" >&5
-+  echo "$as_me:15573: \$? = $ac_status" >&5
++  echo "$as_me:15689: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    sigact_bad=no
  else
-@@ -14619,7 +15578,7 @@
+@@ -14619,7 +15694,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14622 "configure"
-+#line 15581 "configure"
++#line 15697 "configure"
  #include "confdefs.h"
  
  #define _POSIX_SOURCE
-@@ -14634,20 +15593,20 @@
+@@ -14634,20 +15709,20 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14637: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15596: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15712: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14640: \$? = $ac_status" >&5
-+  echo "$as_me:15599: \$? = $ac_status" >&5
++  echo "$as_me:15715: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15718: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14646: \$? = $ac_status" >&5
-+  echo "$as_me:15605: \$? = $ac_status" >&5
++  echo "$as_me:15721: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    sigact_bad=yes
@@ -22590 +25715 @@
  
  else
-@@ -14658,11 +15617,11 @@
+@@ -14658,11 +15733,11 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14661: result: $sigact_bad" >&5
-+echo "$as_me:15620: result: $sigact_bad" >&5
++echo "$as_me:15736: result: $sigact_bad" >&5
  echo "${ECHO_T}$sigact_bad" >&6
  fi
  
 -echo "$as_me:14665: checking if nanosleep really works" >&5
-+echo "$as_me:15624: checking if nanosleep really works" >&5
++echo "$as_me:15740: 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
-@@ -14672,7 +15631,7 @@
+@@ -14672,7 +15747,7 @@
    cf_cv_func_nanosleep=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14675 "configure"
-+#line 15634 "configure"
++#line 15750 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -14697,15 +15656,15 @@
+@@ -14697,15 +15772,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14700: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15775: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14703: \$? = $ac_status" >&5
-+  echo "$as_me:15662: \$? = $ac_status" >&5
++  echo "$as_me:15778: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15780: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14708: \$? = $ac_status" >&5
-+  echo "$as_me:15667: \$? = $ac_status" >&5
++  echo "$as_me:15783: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_nanosleep=yes
  else
-@@ -14717,7 +15676,7 @@
+@@ -14717,7 +15792,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:14720: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:15679: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:15795: result: $cf_cv_func_nanosleep" >&5
  echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
  
  test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
-@@ -14731,23 +15690,23 @@
+@@ -14731,23 +15806,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:14734: checking for $ac_header" >&5
-+echo "$as_me:15693: checking for $ac_header" >&5
++echo "$as_me:15809: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -22654 +25779 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14740 "configure"
-+#line 15699 "configure"
++#line 15815 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:14744: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15703: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15819: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -22666 +25791 @@
    cat conftest.err >&5
 -  echo "$as_me:14750: \$? = $ac_status" >&5
-+  echo "$as_me:15709: \$? = $ac_status" >&5
++  echo "$as_me:15825: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14766,7 +15725,7 @@
+@@ -14766,7 +15841,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:14769: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15728: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15844: 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
-@@ -14781,23 +15740,23 @@
+@@ -14781,23 +15856,23 @@
  for ac_header in sys/termio.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:14784: checking for $ac_header" >&5
-+echo "$as_me:15743: checking for $ac_header" >&5
++echo "$as_me:15859: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -22691 +25816 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14790 "configure"
-+#line 15749 "configure"
++#line 15865 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:14794: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15753: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15869: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -22703 +25828 @@
    cat conftest.err >&5
 -  echo "$as_me:14800: \$? = $ac_status" >&5
-+  echo "$as_me:15759: \$? = $ac_status" >&5
++  echo "$as_me:15875: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14816,7 +15775,7 @@
+@@ -14816,7 +15891,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:14819: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15778: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15894: 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
-@@ -14834,10 +15793,10 @@
+@@ -14834,10 +15909,10 @@
         *)      termios_bad=maybe ;;
         esac
         if test "$termios_bad" = maybe ; then
 -       echo "$as_me:14837: checking whether termios.h needs _POSIX_SOURCE" >&5
-+       echo "$as_me:15796: checking whether termios.h needs _POSIX_SOURCE" >&5
++       echo "$as_me:15912: checking whether termios.h needs _POSIX_SOURCE" >&5
  echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14840 "configure"
-+#line 15799 "configure"
++#line 15915 "configure"
  #include "confdefs.h"
  #include <termios.h>
  int
-@@ -14849,16 +15808,16 @@
+@@ -14849,16 +15924,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14852: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15927: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14855: \$? = $ac_status" >&5
-+  echo "$as_me:15814: \$? = $ac_status" >&5
++  echo "$as_me:15930: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14858: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14861: \$? = $ac_status" >&5
-+  echo "$as_me:15820: \$? = $ac_status" >&5
++  echo "$as_me:15936: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    termios_bad=no
  else
-@@ -14866,7 +15825,7 @@
+@@ -14866,7 +15941,7 @@
  cat conftest.$ac_ext >&5
  
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 14869 "configure"
-+#line 15828 "configure"
++#line 15944 "configure"
  #include "confdefs.h"
  
  #define _POSIX_SOURCE
-@@ -14880,23 +15839,23 @@
+@@ -14880,23 +15955,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14883: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15958: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14886: \$? = $ac_status" >&5
-+  echo "$as_me:15845: \$? = $ac_status" >&5
++  echo "$as_me:15961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14889: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14892: \$? = $ac_status" >&5
-+  echo "$as_me:15851: \$? = $ac_status" >&5
++  echo "$as_me:15967: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    termios_bad=unknown
@@ -22788 +25913 @@
  
  fi
-@@ -14904,19 +15863,19 @@
+@@ -14904,19 +15979,19 @@
  
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -       echo "$as_me:14907: result: $termios_bad" >&5
-+       echo "$as_me:15866: result: $termios_bad" >&5
++       echo "$as_me:15982: result: $termios_bad" >&5
  echo "${ECHO_T}$termios_bad" >&6
         fi
@@ -22799 +25924 @@
  
 -echo "$as_me:14912: checking for tcgetattr" >&5
-+echo "$as_me:15871: checking for tcgetattr" >&5
++echo "$as_me:15987: checking for tcgetattr" >&5
  echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
  if test "${cf_cv_have_tcgetattr+set}" = set; then
@@ -22807 +25932 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14919 "configure"
-+#line 15878 "configure"
++#line 15994 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -14944,16 +15903,16 @@
+@@ -14944,16 +16019,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14947: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16022: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14950: \$? = $ac_status" >&5
-+  echo "$as_me:15909: \$? = $ac_status" >&5
++  echo "$as_me:16025: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:15915: \$? = $ac_status" >&5
++  echo "$as_me:16031: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_tcgetattr=yes
  else
-@@ -14963,20 +15922,20 @@
+@@ -14963,20 +16038,20 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:14966: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:15925: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:16041: result: $cf_cv_have_tcgetattr" >&5
  echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
  test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
@@ -22844 +25969 @@
  
 -echo "$as_me:14972: checking for vsscanf function or workaround" >&5
-+echo "$as_me:15931: checking for vsscanf function or workaround" >&5
++echo "$as_me:16047: 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
@@ -22852 +25977 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14979 "configure"
-+#line 15938 "configure"
++#line 16054 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -14992,16 +15951,16 @@
+@@ -14992,16 +16067,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14995: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14998: \$? = $ac_status" >&5
-+  echo "$as_me:15957: \$? = $ac_status" >&5
++  echo "$as_me:16073: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15001: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15004: \$? = $ac_status" >&5
-+  echo "$as_me:15963: \$? = $ac_status" >&5
++  echo "$as_me:16079: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=vsscanf
  else
-@@ -15009,7 +15968,7 @@
+@@ -15009,7 +16084,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15012 "configure"
-+#line 15971 "configure"
++#line 16087 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15031,16 +15990,16 @@
+@@ -15031,16 +16106,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15034: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16109: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15037: \$? = $ac_status" >&5
-+  echo "$as_me:15996: \$? = $ac_status" >&5
++  echo "$as_me:16112: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15040: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16115: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15043: \$? = $ac_status" >&5
-+  echo "$as_me:16002: \$? = $ac_status" >&5
++  echo "$as_me:16118: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=vfscanf
  else
-@@ -15048,7 +16007,7 @@
+@@ -15048,7 +16123,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15051 "configure"
-+#line 16010 "configure"
++#line 16126 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15070,16 +16029,16 @@
+@@ -15070,16 +16145,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15073: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16148: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15076: \$? = $ac_status" >&5
-+  echo "$as_me:16035: \$? = $ac_status" >&5
++  echo "$as_me:16151: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15079: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16154: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15082: \$? = $ac_status" >&5
-+  echo "$as_me:16041: \$? = $ac_status" >&5
++  echo "$as_me:16157: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=_doscan
  else
-@@ -15094,7 +16053,7 @@
+@@ -15094,7 +16169,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15097: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:16056: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:16172: result: $cf_cv_func_vsscanf" >&5
  echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
  
  case $cf_cv_func_vsscanf in #(vi
-@@ -15112,7 +16071,7 @@
+@@ -15112,7 +16187,7 @@
  ;;
  esac
  
 -echo "$as_me:15115: checking for working mkstemp" >&5
-+echo "$as_me:16074: checking for working mkstemp" >&5
++echo "$as_me:16190: 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
-@@ -15120,13 +16079,13 @@
+@@ -15120,68 +16195,10 @@
  
  rm -rf conftest*
  if test "$cross_compiling" = yes; then
 -  echo "$as_me:15123: checking for mkstemp" >&5
-+  echo "$as_me:16082: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+-if test "${ac_cv_func_mkstemp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line 15129 "configure"
-+#line 16088 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -15157,16 +16116,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char mkstemp (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char mkstemp ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
+-choke me
+-#else
+-f = mkstemp;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16119: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:15163: \$? = $ac_status" >&5
-+  echo "$as_me:16122: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16125: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
 -  echo "$as_me:15169: \$? = $ac_status" >&5
-+  echo "$as_me:16128: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -15176,12 +16135,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_mkstemp=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_mkstemp=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
 -echo "$as_me:15179: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:16138: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
+-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+-
++  cf_cv_func_mkstemp=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15184 "configure"
-+#line 16143 "configure"
++#line 16201 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -15219,15 +16178,15 @@
+@@ -15219,15 +16236,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15222: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16239: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15225: \$? = $ac_status" >&5
-+  echo "$as_me:16184: \$? = $ac_status" >&5
++  echo "$as_me:16242: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16244: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15230: \$? = $ac_status" >&5
-+  echo "$as_me:16189: \$? = $ac_status" >&5
++  echo "$as_me:16247: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_mkstemp=yes
  
-@@ -15242,7 +16201,7 @@
+@@ -15242,8 +16259,69 @@
  fi
  
  fi
 -echo "$as_me:15245: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:16204: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:16262: result: $cf_cv_func_mkstemp" >&5
  echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       echo "$as_me:16265: checking for mkstemp" >&5
++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
++if test "${ac_cv_func_mkstemp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16271 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char mkstemp (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char mkstemp ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
++choke me
++#else
++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:16302: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:16305: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:16308: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:16311: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mkstemp=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_cv_func_mkstemp=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:16321: result: $ac_cv_func_mkstemp" >&5
++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
++
++fi
  if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
         cat >>confdefs.h <<\EOF
-@@ -15260,21 +16219,21 @@
+ #define HAVE_MKSTEMP 1
+@@ -15260,21 +16338,21 @@
  fi
  
  if test "$cross_compiling" = yes ; then
 -       { echo "$as_me:15263: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+       { echo "$as_me:16222: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++       { echo "$as_me:16341: 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:15266: checking whether setvbuf arguments are reversed" >&5
-+       echo "$as_me:16225: checking whether setvbuf arguments are reversed" >&5
++       echo "$as_me:16344: 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
@@ -23052 +26258 @@
    if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:15272: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:16231: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16350: 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; }; }
@@ -23058 +26264 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15277 "configure"
-+#line 16236 "configure"
++#line 16355 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  /* If setvbuf has the reversed format, exit 0. */
-@@ -15291,15 +16250,15 @@
+@@ -15291,15 +16369,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16372: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15297: \$? = $ac_status" >&5
-+  echo "$as_me:16256: \$? = $ac_status" >&5
++  echo "$as_me:16375: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15302: \$? = $ac_status" >&5
-+  echo "$as_me:16261: \$? = $ac_status" >&5
++  echo "$as_me:16380: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_setvbuf_reversed=yes
  else
-@@ -15312,7 +16271,7 @@
+@@ -15312,7 +16390,7 @@
  fi
  rm -f core core.* *.core
  fi
 -echo "$as_me:15315: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:16274: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:16393: 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
  
-@@ -15323,13 +16282,13 @@
+@@ -15323,13 +16401,13 @@
  fi
  
  fi
 -echo "$as_me:15326: checking return type of signal handlers" >&5
-+echo "$as_me:16285: checking return type of signal handlers" >&5
++echo "$as_me:16404: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
  if test "${ac_cv_type_signal+set}" = set; then
@@ -23103 +26309 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15332 "configure"
-+#line 16291 "configure"
++#line 16410 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -15351,16 +16310,16 @@
+@@ -15351,16 +16429,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15357: \$? = $ac_status" >&5
-+  echo "$as_me:16316: \$? = $ac_status" >&5
++  echo "$as_me:16435: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15363: \$? = $ac_status" >&5
-+  echo "$as_me:16322: \$? = $ac_status" >&5
++  echo "$as_me:16441: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signal=void
  else
-@@ -15370,21 +16329,73 @@
+@@ -15370,21 +16448,73 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:15373: result: $ac_cv_type_signal" >&5
-+echo "$as_me:16332: result: $ac_cv_type_signal" >&5
++echo "$as_me:16451: result: $ac_cv_type_signal" >&5
  echo "${ECHO_T}$ac_cv_type_signal" >&6
  
@@ -23141 +26347 @@
  
 -echo "$as_me:15380: checking for type sigaction_t" >&5
-+echo "$as_me:16339: checking for intptr_t" >&5
++echo "$as_me:16458: 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
@@ -23147 +26353 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 16345 "configure"
++#line 16464 "configure"
 +#include "confdefs.h"
 +$ac_includes_default
@@ -23162 +26368 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:16360: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16363: \$? = $ac_status" >&5
++  echo "$as_me:16482: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:16366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16369: \$? = $ac_status" >&5
++  echo "$as_me:16488: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_type_intptr_t=yes
@@ -23181 +26387 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +fi
-+echo "$as_me:16379: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:16498: result: $ac_cv_type_intptr_t" >&5
 +echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 +if test $ac_cv_type_intptr_t = yes; then
@@ -23193 +26399 @@
 +fi
 +
-+echo "$as_me:16391: checking for type sigaction_t" >&5
++echo "$as_me:16510: 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
@@ -23201 +26407 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 15387 "configure"
-+#line 16398 "configure"
++#line 16517 "configure"
  #include "confdefs.h"
  
  #include <signal.h>
-@@ -15397,16 +16408,16 @@
+@@ -15397,16 +16527,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16530: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15403: \$? = $ac_status" >&5
-+  echo "$as_me:16414: \$? = $ac_status" >&5
++  echo "$as_me:16533: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16536: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15409: \$? = $ac_status" >&5
-+  echo "$as_me:16420: \$? = $ac_status" >&5
++  echo "$as_me:16539: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_sigaction=yes
  else
-@@ -15417,13 +16428,13 @@
+@@ -15417,13 +16547,13 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  
 -echo "$as_me:15420: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:16431: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:16550: result: $cf_cv_type_sigaction" >&5
  echo "${ECHO_T}$cf_cv_type_sigaction" >&6
  test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
@@ -23238 +26444 @@
  
 -echo "$as_me:15426: checking declaration of size-change" >&5
-+echo "$as_me:16437: checking declaration of size-change" >&5
++echo "$as_me:16556: 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
-@@ -15438,7 +16449,7 @@
+@@ -15438,7 +16568,7 @@
      CPPFLAGS="$cf_save_CPPFLAGS"
      test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
      cat >conftest.$ac_ext <<_ACEOF
 -#line 15441 "configure"
-+#line 16452 "configure"
++#line 16571 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #ifdef HAVE_TERMIOS_H
-@@ -15482,16 +16493,16 @@
+@@ -15482,16 +16612,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15485: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16615: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15488: \$? = $ac_status" >&5
-+  echo "$as_me:16499: \$? = $ac_status" >&5
++  echo "$as_me:16618: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15491: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16621: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15494: \$? = $ac_status" >&5
-+  echo "$as_me:16505: \$? = $ac_status" >&5
++  echo "$as_me:16624: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sizechange=yes
  else
-@@ -15510,7 +16521,7 @@
+@@ -15510,7 +16640,7 @@
  done
  
  fi
 -echo "$as_me:15513: result: $cf_cv_sizechange" >&5
-+echo "$as_me:16524: result: $cf_cv_sizechange" >&5
++echo "$as_me:16643: result: $cf_cv_sizechange" >&5
  echo "${ECHO_T}$cf_cv_sizechange" >&6
  if test "$cf_cv_sizechange" != no ; then
         cat >>confdefs.h <<\EOF
-@@ -15527,13 +16538,13 @@
+@@ -15527,13 +16657,13 @@
         esac
  fi
  
 -echo "$as_me:15530: checking for memmove" >&5
-+echo "$as_me:16541: checking for memmove" >&5
++echo "$as_me:16660: checking for memmove" >&5
  echo $ECHO_N "checking for memmove... $ECHO_C" >&6
  if test "${ac_cv_func_memmove+set}" = set; then
@@ -23293 +26499 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15536 "configure"
-+#line 16547 "configure"
++#line 16666 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char memmove (); below.  */
-@@ -15564,16 +16575,16 @@
+@@ -15556,7 +16686,7 @@
+ #if defined (__stub_memmove) || defined (__stub___memmove)
+ choke me
+ #else
+-f = memmove;
++f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -15564,16 +16694,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16578: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16697: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15570: \$? = $ac_status" >&5
-+  echo "$as_me:16581: \$? = $ac_status" >&5
++  echo "$as_me:16700: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15576: \$? = $ac_status" >&5
-+  echo "$as_me:16587: \$? = $ac_status" >&5
++  echo "$as_me:16706: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_memmove=yes
  else
-@@ -15583,19 +16594,19 @@
+@@ -15583,19 +16713,19 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15586: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:16597: result: $ac_cv_func_memmove" >&5
++echo "$as_me:16716: result: $ac_cv_func_memmove" >&5
  echo "${ECHO_T}$ac_cv_func_memmove" >&6
  if test $ac_cv_func_memmove = yes; then
@@ -23330 +26545 @@
  
 -echo "$as_me:15592: checking for bcopy" >&5
-+echo "$as_me:16603: checking for bcopy" >&5
++echo "$as_me:16722: checking for bcopy" >&5
  echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
  if test "${ac_cv_func_bcopy+set}" = set; then
@@ -23337 +26552 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15598 "configure"
-+#line 16609 "configure"
++#line 16728 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char bcopy (); below.  */
-@@ -15626,16 +16637,16 @@
+@@ -15618,7 +16748,7 @@
+ #if defined (__stub_bcopy) || defined (__stub___bcopy)
+ choke me
+ #else
+-f = bcopy;
++f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -15626,16 +16756,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15629: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16640: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15632: \$? = $ac_status" >&5
-+  echo "$as_me:16643: \$? = $ac_status" >&5
++  echo "$as_me:16762: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15638: \$? = $ac_status" >&5
-+  echo "$as_me:16649: \$? = $ac_status" >&5
++  echo "$as_me:16768: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_bcopy=yes
  else
-@@ -15645,11 +16656,11 @@
+@@ -15645,11 +16775,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15648: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:16659: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:16778: result: $ac_cv_func_bcopy" >&5
  echo "${ECHO_T}$ac_cv_func_bcopy" >&6
  if test $ac_cv_func_bcopy = yes; then
  
 -       echo "$as_me:15652: checking if bcopy does overlapping moves" >&5
-+       echo "$as_me:16663: checking if bcopy does overlapping moves" >&5
++       echo "$as_me:16782: 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
-@@ -15659,7 +16670,7 @@
+@@ -15659,7 +16789,7 @@
    cf_cv_good_bcopy=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15662 "configure"
-+#line 16673 "configure"
++#line 16792 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -15673,15 +16684,15 @@
+@@ -15673,15 +16803,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15676: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16806: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15679: \$? = $ac_status" >&5
-+  echo "$as_me:16690: \$? = $ac_status" >&5
++  echo "$as_me:16809: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16811: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15684: \$? = $ac_status" >&5
-+  echo "$as_me:16695: \$? = $ac_status" >&5
++  echo "$as_me:16814: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_good_bcopy=yes
  else
-@@ -15694,7 +16705,7 @@
+@@ -15694,7 +16824,7 @@
  fi
  
  fi
 -echo "$as_me:15697: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:16708: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:16827: result: $cf_cv_good_bcopy" >&5
  echo "${ECHO_T}$cf_cv_good_bcopy" >&6
  
  else
-@@ -15715,7 +16726,7 @@
+@@ -15715,7 +16845,7 @@
  
  fi
  
 -echo "$as_me:15718: checking if poll really works" >&5
-+echo "$as_me:16729: checking if poll really works" >&5
++echo "$as_me:16848: 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
-@@ -15725,7 +16736,7 @@
+@@ -15725,10 +16855,13 @@
    cf_cv_working_poll=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15728 "configure"
-+#line 16739 "configure"
++#line 16858 "configure"
  #include "confdefs.h"
  
++#include <stdlib.h>
  #include <stdio.h>
-@@ -15746,15 +16757,15 @@
++#include <unistd.h>
++#include <fcntl.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #else
+@@ -15738,23 +16871,46 @@
+        struct pollfd myfds;
+        int ret;
+ 
+-       myfds.fd = 0;
++       /* check for Darwin bug with respect to "devices" */
++       myfds.fd = open("/dev/null", 1);        /* O_WRONLY */
++       if (myfds.fd < 0)
++               myfds.fd = 0;
+        myfds.events = POLLIN;
++       myfds.revents = 0;
+ 
+        ret = poll(&myfds, 1, 100);
+-       ${cf_cv_main_return:-return}(ret != 0);
++
++       if (ret < 0 || (myfds.revents & POLLNVAL)) {
++               ret = -1;
++       } else {
++               int fd = 0;
++               if (!isatty(fd)) {
++                       fd = open("/dev/tty", 2);       /* O_RDWR */
++               }
++
++               if (fd >= 0) {
++                       /* also check with standard input */
++                       myfds.fd = fd;
++                       myfds.events = POLLIN;
++                       myfds.revents = 0;
++                       ret = poll(&myfds, 1, 100);
++               } else {
++                       ret = -1;
++               }
++       }
++       ${cf_cv_main_return:-return}(ret < 0);
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15749: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16905: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15752: \$? = $ac_status" >&5
-+  echo "$as_me:16763: \$? = $ac_status" >&5
++  echo "$as_me:16908: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15754: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16910: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15757: \$? = $ac_status" >&5
-+  echo "$as_me:16768: \$? = $ac_status" >&5
++  echo "$as_me:16913: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_working_poll=yes
  else
-@@ -15766,20 +16777,20 @@
+@@ -15766,20 +16922,20 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:15769: result: $cf_cv_working_poll" >&5
-+echo "$as_me:16780: result: $cf_cv_working_poll" >&5
++echo "$as_me:16925: result: $cf_cv_working_poll" >&5
  echo "${ECHO_T}$cf_cv_working_poll" >&6
  test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
@@ -23464 +26727 @@
  
 -echo "$as_me:15775: checking for va_copy" >&5
-+echo "$as_me:16786: checking for va_copy" >&5
++echo "$as_me:16931: 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
@@ -23472 +26735 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15782 "configure"
-+#line 16793 "configure"
++#line 16938 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15796,16 +16807,16 @@
+@@ -15796,16 +16952,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16955: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15802: \$? = $ac_status" >&5
-+  echo "$as_me:16813: \$? = $ac_status" >&5
++  echo "$as_me:16958: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15805: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15808: \$? = $ac_status" >&5
-+  echo "$as_me:16819: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_va_copy=yes
  else
-@@ -15815,21 +16826,21 @@
+@@ -15815,21 +16971,21 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15818: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:16829: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:16974: result: $cf_cv_have_va_copy" >&5
  echo "${ECHO_T}$cf_cv_have_va_copy" >&6
  
@@ -23510 +26773 @@
  
 -echo "$as_me:15825: checking for __va_copy" >&5
-+echo "$as_me:16836: checking for __va_copy" >&5
++echo "$as_me:16981: 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
@@ -23518 +26781 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15832 "configure"
-+#line 16843 "configure"
++#line 16988 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15846,16 +16857,16 @@
+@@ -15846,16 +17002,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17005: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15852: \$? = $ac_status" >&5
-+  echo "$as_me:16863: \$? = $ac_status" >&5
++  echo "$as_me:17008: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15855: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17011: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15858: \$? = $ac_status" >&5
-+  echo "$as_me:16869: \$? = $ac_status" >&5
++  echo "$as_me:17014: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have___va_copy=yes
  else
-@@ -15865,20 +16876,20 @@
+@@ -15865,20 +17021,20 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15868: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:16879: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:17024: result: $cf_cv_have___va_copy" >&5
  echo "${ECHO_T}$cf_cv_have___va_copy" >&6
  
@@ -23556 +26819 @@
  
 -echo "$as_me:15875: checking for pid_t" >&5
-+echo "$as_me:16886: checking for pid_t" >&5
++echo "$as_me:17031: 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
@@ -23563 +26826 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15881 "configure"
-+#line 16892 "configure"
++#line 17037 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -15893,16 +16904,16 @@
+@@ -15893,16 +17049,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15896: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17052: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15899: \$? = $ac_status" >&5
-+  echo "$as_me:16910: \$? = $ac_status" >&5
++  echo "$as_me:17055: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15902: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15905: \$? = $ac_status" >&5
-+  echo "$as_me:16916: \$? = $ac_status" >&5
++  echo "$as_me:17061: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_pid_t=yes
  else
-@@ -15912,7 +16923,7 @@
+@@ -15912,7 +17068,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:15915: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:16926: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:17071: result: $ac_cv_type_pid_t" >&5
  echo "${ECHO_T}$ac_cv_type_pid_t" >&6
  if test $ac_cv_type_pid_t = yes; then
    :
-@@ -15927,23 +16938,23 @@
+@@ -15927,23 +17083,23 @@
  for ac_header in unistd.h vfork.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:15930: checking for $ac_header" >&5
-+echo "$as_me:16941: checking for $ac_header" >&5
++echo "$as_me:17086: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -23609 +26872 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15936 "configure"
-+#line 16947 "configure"
++#line 17092 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:15940: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16951: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17096: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -23621 +26884 @@
    cat conftest.err >&5
 -  echo "$as_me:15946: \$? = $ac_status" >&5
-+  echo "$as_me:16957: \$? = $ac_status" >&5
++  echo "$as_me:17102: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15962,7 +16973,7 @@
+@@ -15962,7 +17118,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:15965: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16976: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17121: 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
-@@ -15975,13 +16986,13 @@
+@@ -15975,13 +17131,13 @@
  for ac_func in fork vfork
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:15978: checking for $ac_func" >&5
-+echo "$as_me:16989: checking for $ac_func" >&5
++echo "$as_me:17134: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -23646 +26909 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15984 "configure"
-+#line 16995 "configure"
++#line 17140 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -16012,16 +17023,16 @@
+@@ -16004,7 +17160,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -16012,16 +17168,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16015: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17026: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17171: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16018: \$? = $ac_status" >&5
-+  echo "$as_me:17029: \$? = $ac_status" >&5
++  echo "$as_me:17174: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17177: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16024: \$? = $ac_status" >&5
-+  echo "$as_me:17035: \$? = $ac_status" >&5
++  echo "$as_me:17180: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -16031,7 +17042,7 @@
+@@ -16031,7 +17187,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:16034: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17045: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17190: 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
-@@ -16043,7 +17054,7 @@
+@@ -16043,7 +17199,7 @@
  
  ac_cv_func_fork_works=$ac_cv_func_fork
  if test "x$ac_cv_func_fork" = xyes; then
 -  echo "$as_me:16046: checking for working fork" >&5
-+  echo "$as_me:17057: checking for working fork" >&5
++  echo "$as_me:17202: 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
-@@ -16066,15 +17077,15 @@
+@@ -16066,15 +17222,15 @@
        }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17225: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16072: \$? = $ac_status" >&5
-+  echo "$as_me:17083: \$? = $ac_status" >&5
++  echo "$as_me:17228: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:16074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16077: \$? = $ac_status" >&5
-+  echo "$as_me:17088: \$? = $ac_status" >&5
++  echo "$as_me:17233: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fork_works=yes
  else
-@@ -16086,7 +17097,7 @@
+@@ -16086,7 +17242,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:16089: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:17100: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:17245: result: $ac_cv_func_fork_works" >&5
  echo "${ECHO_T}$ac_cv_func_fork_works" >&6
  
  fi
-@@ -16100,12 +17111,12 @@
+@@ -16100,12 +17256,12 @@
        ac_cv_func_fork_works=yes
        ;;
    esac
 -  { echo "$as_me:16103: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:17114: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:17259: 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
@@ -23729 +27001 @@
  if test "x$ac_cv_func_vfork" = xyes; then
 -  echo "$as_me:16108: checking for working vfork" >&5
-+  echo "$as_me:17119: checking for working vfork" >&5
++  echo "$as_me:17264: 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
-@@ -16114,7 +17125,7 @@
+@@ -16114,7 +17270,7 @@
    ac_cv_func_vfork_works=cross
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 16117 "configure"
-+#line 17128 "configure"
++#line 17273 "configure"
  #include "confdefs.h"
  /* Thanks to Paul Eggert for this test.  */
  #include <stdio.h>
-@@ -16211,15 +17222,15 @@
+@@ -16211,15 +17367,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:16214: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16217: \$? = $ac_status" >&5
-+  echo "$as_me:17228: \$? = $ac_status" >&5
++  echo "$as_me:17373: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:16219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17375: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16222: \$? = $ac_status" >&5
-+  echo "$as_me:17233: \$? = $ac_status" >&5
++  echo "$as_me:17378: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_vfork_works=yes
  else
-@@ -16231,13 +17242,13 @@
+@@ -16231,13 +17387,13 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:16234: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:17245: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:17390: result: $ac_cv_func_vfork_works" >&5
  echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
  
@@ -23774 +27046 @@
    ac_cv_func_vfork_works=ac_cv_func_vfork
 -  { echo "$as_me:16240: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:17251: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:17396: 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
  
-@@ -16264,7 +17275,7 @@
+@@ -16264,7 +17420,7 @@
  
  # special check for test/ditto.c
  
 -echo "$as_me:16267: checking for openpty in -lutil" >&5
-+echo "$as_me:17278: checking for openpty in -lutil" >&5
++echo "$as_me:17423: 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
-@@ -16272,7 +17283,7 @@
+@@ -16272,7 +17428,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 16275 "configure"
-+#line 17286 "configure"
++#line 17431 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16291,16 +17302,16 @@
+@@ -16291,16 +17447,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17450: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16297: \$? = $ac_status" >&5
-+  echo "$as_me:17308: \$? = $ac_status" >&5
++  echo "$as_me:17453: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17456: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16303: \$? = $ac_status" >&5
-+  echo "$as_me:17314: \$? = $ac_status" >&5
++  echo "$as_me:17459: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_util_openpty=yes
  else
-@@ -16311,7 +17322,7 @@
+@@ -16311,7 +17467,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:16314: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:17325: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:17470: result: $ac_cv_lib_util_openpty" >&5
  echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
  if test $ac_cv_lib_util_openpty = yes; then
    cf_cv_lib_util=yes
-@@ -16319,7 +17330,7 @@
+@@ -16319,7 +17475,7 @@
    cf_cv_lib_util=no
  fi
  
 -echo "$as_me:16322: checking for openpty header" >&5
-+echo "$as_me:17333: checking for openpty header" >&5
++echo "$as_me:17478: 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
-@@ -16330,7 +17341,7 @@
+@@ -16330,7 +17486,7 @@
      for cf_header in pty.h libutil.h util.h
      do
      cat >conftest.$ac_ext <<_ACEOF
 -#line 16333 "configure"
-+#line 17344 "configure"
++#line 17489 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -16347,16 +17358,16 @@
+@@ -16347,16 +17503,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16350: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17506: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16353: \$? = $ac_status" >&5
-+  echo "$as_me:17364: \$? = $ac_status" >&5
++  echo "$as_me:17509: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16356: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17512: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16359: \$? = $ac_status" >&5
-+  echo "$as_me:17370: \$? = $ac_status" >&5
++  echo "$as_me:17515: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
          cf_cv_func_openpty=$cf_header
-@@ -16374,7 +17385,7 @@
+@@ -16374,7 +17530,7 @@
      LIBS="$cf_save_LIBS"
  
  fi
 -echo "$as_me:16377: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:17388: result: $cf_cv_func_openpty" >&5
++echo "$as_me:17533: result: $cf_cv_func_openpty" >&5
  echo "${ECHO_T}$cf_cv_func_openpty" >&6
  
  if test "$cf_cv_func_openpty" != no ; then
-@@ -16426,7 +17437,7 @@
+@@ -16426,7 +17582,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 16429 "configure"
-+#line 17440 "configure"
++#line 17585 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -16438,16 +17449,16 @@
+@@ -16438,16 +17594,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17597: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16444: \$? = $ac_status" >&5
-+  echo "$as_me:17455: \$? = $ac_status" >&5
++  echo "$as_me:17600: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17603: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16450: \$? = $ac_status" >&5
-+  echo "$as_me:17461: \$? = $ac_status" >&5
++  echo "$as_me:17606: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -16464,7 +17475,7 @@
+@@ -16464,7 +17620,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:16467: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:17478: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:17623: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -16498,7 +17509,7 @@
+@@ -16498,7 +17654,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:16501: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:17512: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:17657: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -16509,23 +17520,23 @@
+@@ -16509,23 +17665,23 @@
      fi
  esac
  
 -echo "$as_me:16512: checking for db.h" >&5
-+echo "$as_me:17523: checking for db.h" >&5
++echo "$as_me:17668: 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
@@ -23934 +27206 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 16518 "configure"
-+#line 17529 "configure"
++#line 17674 "configure"
  #include "confdefs.h"
  #include <db.h>
  _ACEOF
 -if { (eval echo "$as_me:16522: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17533: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17678: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -23946 +27218 @@
    cat conftest.err >&5
 -  echo "$as_me:16528: \$? = $ac_status" >&5
-+  echo "$as_me:17539: \$? = $ac_status" >&5
++  echo "$as_me:17684: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16544,11 +17555,11 @@
+@@ -16544,11 +17700,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:16547: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:17558: result: $ac_cv_header_db_h" >&5
++echo "$as_me:17703: result: $ac_cv_header_db_h" >&5
  echo "${ECHO_T}$ac_cv_header_db_h" >&6
  if test $ac_cv_header_db_h = yes; then
  
 -echo "$as_me:16551: checking for version of db" >&5
-+echo "$as_me:17562: checking for version of db" >&5
++echo "$as_me:17707: 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
-@@ -16559,10 +17570,10 @@
+@@ -16559,10 +17715,10 @@
  for cf_db_version in 1 2 3 4 5
  do
  
 -echo "${as_me:-configure}:16562: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:17573: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:17718: testing checking for db version $cf_db_version ..." 1>&5
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16565 "configure"
-+#line 17576 "configure"
++#line 17721 "configure"
  #include "confdefs.h"
  
  $ac_includes_default
-@@ -16592,16 +17603,16 @@
+@@ -16592,16 +17748,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17751: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16598: \$? = $ac_status" >&5
-+  echo "$as_me:17609: \$? = $ac_status" >&5
++  echo "$as_me:17754: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16601: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16604: \$? = $ac_status" >&5
-+  echo "$as_me:17615: \$? = $ac_status" >&5
++  echo "$as_me:17760: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_hashed_db_version=$cf_db_version
-@@ -16615,16 +17626,16 @@
+@@ -16615,16 +17771,16 @@
  done
  
  fi
 -echo "$as_me:16618: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:17629: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:17774: 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 "$as_me:16622: error: Cannot determine version of db" >&5
-+       { { echo "$as_me:17633: error: Cannot determine version of db" >&5
++       { { echo "$as_me:17778: error: Cannot determine version of db" >&5
  echo "$as_me: error: Cannot determine version of db" >&2;}
     { (exit 1); exit 1; }; }
@@ -24014 +27286 @@
  
 -echo "$as_me:16627: checking for db libraries" >&5
-+echo "$as_me:17638: checking for db libraries" >&5
++echo "$as_me:17783: 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
-@@ -16638,10 +17649,10 @@
+@@ -16638,10 +17794,10 @@
                 LIBS="-l$cf_db_libs $LIBS"
         fi
  
 -echo "${as_me:-configure}:16641: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:17652: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:17797: testing checking for library "$cf_db_libs" ..." 1>&5
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16644 "configure"
-+#line 17655 "configure"
++#line 17800 "configure"
  #include "confdefs.h"
  
  $ac_includes_default
-@@ -16696,16 +17707,16 @@
+@@ -16696,16 +17852,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16699: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17710: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17855: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16702: \$? = $ac_status" >&5
-+  echo "$as_me:17713: \$? = $ac_status" >&5
++  echo "$as_me:17858: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17861: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16708: \$? = $ac_status" >&5
-+  echo "$as_me:17719: \$? = $ac_status" >&5
++  echo "$as_me:17864: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         if test -n "$cf_db_libs" ; then
-@@ -16725,11 +17736,11 @@
+@@ -16725,11 +17881,11 @@
  done
  
  fi
 -echo "$as_me:16728: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:17739: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:17884: 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 "$as_me:16732: error: Cannot determine library for db" >&5
-+               { { echo "$as_me:17743: error: Cannot determine library for db" >&5
++               { { echo "$as_me:17888: 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
-@@ -16739,7 +17750,7 @@
+@@ -16739,7 +17895,7 @@
  
  else
  
 -       { { echo "$as_me:16742: error: Cannot find db.h" >&5
-+       { { echo "$as_me:17753: error: Cannot find db.h" >&5
++       { { echo "$as_me:17898: error: Cannot find db.h" >&5
  echo "$as_me: error: Cannot find db.h" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -16754,7 +17765,7 @@
+@@ -16754,7 +17910,7 @@
  
  # Just in case, check if the C compiler has a bool type.
  
 -echo "$as_me:16757: checking if we should include stdbool.h" >&5
-+echo "$as_me:17768: checking if we should include stdbool.h" >&5
++echo "$as_me:17913: 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
-@@ -16762,7 +17773,7 @@
+@@ -16762,7 +17918,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16765 "configure"
-+#line 17776 "configure"
++#line 17921 "configure"
  #include "confdefs.h"
  
  int
-@@ -16774,23 +17785,23 @@
+@@ -16774,23 +17930,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17933: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16780: \$? = $ac_status" >&5
-+  echo "$as_me:17791: \$? = $ac_status" >&5
++  echo "$as_me:17936: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17939: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16786: \$? = $ac_status" >&5
-+  echo "$as_me:17797: \$? = $ac_status" >&5
++  echo "$as_me:17942: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=0
@@ -24118 +27390 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 16793 "configure"
-+#line 17804 "configure"
++#line 17949 "configure"
  #include "confdefs.h"
  
  #ifndef __BEOS__
-@@ -16806,16 +17817,16 @@
+@@ -16806,16 +17962,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17965: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16812: \$? = $ac_status" >&5
-+  echo "$as_me:17823: \$? = $ac_status" >&5
++  echo "$as_me:17968: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16815: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17826: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17971: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16818: \$? = $ac_status" >&5
-+  echo "$as_me:17829: \$? = $ac_status" >&5
++  echo "$as_me:17974: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=1
  else
-@@ -16829,13 +17840,13 @@
+@@ -16829,13 +17985,13 @@
  fi
  
  if test "$cf_cv_header_stdbool_h" = 1
 -then   echo "$as_me:16832: result: yes" >&5
-+then   echo "$as_me:17843: result: yes" >&5
++then   echo "$as_me:17988: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:16834: result: no" >&5
-+else   echo "$as_me:17845: result: no" >&5
++else   echo "$as_me:17990: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:16838: checking for builtin bool type" >&5
-+echo "$as_me:17849: checking for builtin bool type" >&5
++echo "$as_me:17994: 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
-@@ -16843,7 +17854,7 @@
+@@ -16843,7 +17999,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16846 "configure"
-+#line 17857 "configure"
++#line 18002 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -16858,16 +17869,16 @@
+@@ -16858,16 +18014,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16861: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18017: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16864: \$? = $ac_status" >&5
-+  echo "$as_me:17875: \$? = $ac_status" >&5
++  echo "$as_me:18020: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16867: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18023: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16870: \$? = $ac_status" >&5
-+  echo "$as_me:17881: \$? = $ac_status" >&5
++  echo "$as_me:18026: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cc_bool_type=1
  else
-@@ -16880,9 +17891,9 @@
+@@ -16880,9 +18036,9 @@
  fi
  
  if test "$cf_cv_cc_bool_type" = 1
 -then   echo "$as_me:16883: result: yes" >&5
-+then   echo "$as_me:17894: result: yes" >&5
++then   echo "$as_me:18039: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:16885: result: no" >&5
-+else   echo "$as_me:17896: result: no" >&5
++else   echo "$as_me:18041: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -16904,7 +17915,7 @@
+@@ -16904,7 +18060,7 @@
         cf_stdcpp_libname=stdc++
         ;;
  esac
 -echo "$as_me:16907: checking for library $cf_stdcpp_libname" >&5
-+echo "$as_me:17918: checking for library $cf_stdcpp_libname" >&5
++echo "$as_me:18063: 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
-@@ -16913,7 +17924,7 @@
+@@ -16913,7 +18069,7 @@
         cf_save="$LIBS"
         LIBS="-l$cf_stdcpp_libname $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 16916 "configure"
-+#line 17927 "configure"
++#line 18072 "configure"
  #include "confdefs.h"
  
  #include <strstream.h>
-@@ -16929,16 +17940,16 @@
+@@ -16929,16 +18085,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16932: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18088: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16935: \$? = $ac_status" >&5
-+  echo "$as_me:17946: \$? = $ac_status" >&5
++  echo "$as_me:18091: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16938: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18094: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16941: \$? = $ac_status" >&5
-+  echo "$as_me:17952: \$? = $ac_status" >&5
++  echo "$as_me:18097: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_libstdcpp=yes
  else
-@@ -16950,12 +17961,12 @@
+@@ -16950,12 +18106,12 @@
         LIBS="$cf_save"
  
  fi
 -echo "$as_me:16953: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:17964: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:18109: result: $cf_cv_libstdcpp" >&5
  echo "${ECHO_T}$cf_cv_libstdcpp" >&6
  test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS"
@@ -24252 +27524 @@
  
 -       echo "$as_me:16958: checking whether $CXX understands -c and -o together" >&5
-+       echo "$as_me:17969: checking whether $CXX understands -c and -o together" >&5
++       echo "$as_me:18114: 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
-@@ -16971,15 +17982,15 @@
+@@ -16971,15 +18127,15 @@
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 -if { (eval echo "$as_me:16974: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:17985: \"$ac_try\"") >&5
++if { (eval echo "$as_me:18130: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16977: \$? = $ac_status" >&5
-+  echo "$as_me:17988: \$? = $ac_status" >&5
++  echo "$as_me:18133: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -  test -f conftest2.$ac_objext && { (eval echo "$as_me:16979: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:17990: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:18135: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16982: \$? = $ac_status" >&5
-+  echo "$as_me:17993: \$? = $ac_status" >&5
++  echo "$as_me:18138: \$? = $ac_status" >&5
    (exit $ac_status); };
  then
    eval cf_cv_prog_CXX_c_o=yes
-@@ -16990,10 +18001,10 @@
+@@ -16990,10 +18146,10 @@
  
  fi
  if test $cf_cv_prog_CXX_c_o = yes; then
 -  echo "$as_me:16993: result: yes" >&5
-+  echo "$as_me:18004: result: yes" >&5
++  echo "$as_me:18149: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:16996: result: no" >&5
-+  echo "$as_me:18007: result: no" >&5
++  echo "$as_me:18152: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -17013,12 +18024,12 @@
+@@ -17013,12 +18169,12 @@
         ;;
  esac
  if test "$GXX" = yes; then
 -       echo "$as_me:17016: checking for lib$cf_gpp_libname" >&5
-+       echo "$as_me:18027: checking for lib$cf_gpp_libname" >&5
++       echo "$as_me:18172: checking for lib$cf_gpp_libname" >&5
  echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
         cf_save="$LIBS"
@@ -24300 +27572 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17021 "configure"
-+#line 18032 "configure"
++#line 18177 "configure"
  #include "confdefs.h"
  
  #include <$cf_gpp_libname/builtin.h>
-@@ -17032,16 +18043,16 @@
+@@ -17032,16 +18188,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:17035: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18191: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17038: \$? = $ac_status" >&5
-+  echo "$as_me:18049: \$? = $ac_status" >&5
++  echo "$as_me:18194: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:17041: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18197: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17044: \$? = $ac_status" >&5
-+  echo "$as_me:18055: \$? = $ac_status" >&5
++  echo "$as_me:18200: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cxx_library=yes
          CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
-@@ -17060,7 +18071,7 @@
+@@ -17060,7 +18216,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
 -#line 17063 "configure"
-+#line 18074 "configure"
++#line 18219 "configure"
  #include "confdefs.h"
  
  #include <builtin.h>
-@@ -17074,16 +18085,16 @@
+@@ -17074,16 +18230,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:17077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18233: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17080: \$? = $ac_status" >&5
-+  echo "$as_me:18091: \$? = $ac_status" >&5
++  echo "$as_me:18236: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:17083: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18239: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17086: \$? = $ac_status" >&5
-+  echo "$as_me:18097: \$? = $ac_status" >&5
++  echo "$as_me:18242: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cxx_library=yes
          CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
-@@ -17100,7 +18111,7 @@
+@@ -17100,7 +18256,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         LIBS="$cf_save"
 -       echo "$as_me:17103: result: $cf_cxx_library" >&5
-+       echo "$as_me:18114: result: $cf_cxx_library" >&5
++       echo "$as_me:18259: result: $cf_cxx_library" >&5
  echo "${ECHO_T}$cf_cxx_library" >&6
  fi
  
-@@ -17116,7 +18127,7 @@
+@@ -17116,7 +18272,7 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  ac_main_return=return
 -echo "$as_me:17119: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:18130: checking how to run the C++ preprocessor" >&5
++echo "$as_me:18275: 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
-@@ -17133,18 +18144,18 @@
+@@ -17133,18 +18289,18 @@
    # 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 17136 "configure"
-+#line 18147 "configure"
++#line 18292 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -24384 +27656 @@
  _ACEOF
 -if { (eval echo "$as_me:17141: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18152: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18297: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24391 +27663 @@
    cat conftest.err >&5
 -  echo "$as_me:17147: \$? = $ac_status" >&5
-+  echo "$as_me:18158: \$? = $ac_status" >&5
++  echo "$as_me:18303: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17167,17 +18178,17 @@
+@@ -17167,17 +18323,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17170 "configure"
-+#line 18181 "configure"
++#line 18326 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:17174: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18185: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18330: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24412 +27684 @@
    cat conftest.err >&5
 -  echo "$as_me:17180: \$? = $ac_status" >&5
-+  echo "$as_me:18191: \$? = $ac_status" >&5
++  echo "$as_me:18336: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17214,7 +18225,7 @@
+@@ -17214,7 +18370,7 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
 -echo "$as_me:17217: result: $CXXCPP" >&5
-+echo "$as_me:18228: result: $CXXCPP" >&5
++echo "$as_me:18373: result: $CXXCPP" >&5
  echo "${ECHO_T}$CXXCPP" >&6
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
-@@ -17224,18 +18235,18 @@
+@@ -17224,18 +18380,18 @@
    # 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 17227 "configure"
-+#line 18238 "configure"
++#line 18383 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -24436 +27708 @@
  _ACEOF
 -if { (eval echo "$as_me:17232: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18243: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18388: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24443 +27715 @@
    cat conftest.err >&5
 -  echo "$as_me:17238: \$? = $ac_status" >&5
-+  echo "$as_me:18249: \$? = $ac_status" >&5
++  echo "$as_me:18394: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17258,17 +18269,17 @@
+@@ -17258,17 +18414,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17261 "configure"
-+#line 18272 "configure"
++#line 18417 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:17265: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18276: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18421: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24464 +27736 @@
    cat conftest.err >&5
 -  echo "$as_me:17271: \$? = $ac_status" >&5
-+  echo "$as_me:18282: \$? = $ac_status" >&5
++  echo "$as_me:18427: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17296,7 +18307,7 @@
+@@ -17296,7 +18452,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:17299: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:18310: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:18455: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
  echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -17308,26 +18319,74 @@
+@@ -17308,26 +18464,74 @@
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  ac_main_return=return
@@ -24485 +27757 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:18325: checking for $ac_header" >&5
++echo "$as_me:18470: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -24491 +27763 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 18331 "configure"
++#line 18476 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:18335: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18480: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -24501 +27773 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:18341: \$? = $ac_status" >&5
++  echo "$as_me:18486: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -24520 +27792 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:18360: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18505: 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
@@ -24534 +27806 @@
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:17314: checking for $ac_header" >&5
-+echo "$as_me:18373: checking for $ac_header" >&5
++echo "$as_me:18518: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -24541 +27813 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17320 "configure"
-+#line 18379 "configure"
++#line 18524 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:17324: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18383: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18528: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24553 +27825 @@
    cat conftest.err >&5
 -  echo "$as_me:17330: \$? = $ac_status" >&5
-+  echo "$as_me:18389: \$? = $ac_status" >&5
++  echo "$as_me:18534: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17346,7 +18405,7 @@
+@@ -17346,7 +18550,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:17349: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18408: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18553: 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
-@@ -17356,11 +18415,11 @@
+@@ -17356,11 +18560,11 @@
  fi
  done
@@ -24573 +27845 @@
 -        echo "$as_me:17360: checking if iostream uses std-namespace" >&5
 +if test x"$ac_cv_header_iostream" = xyes ; then
-+       echo "$as_me:18419: checking if iostream uses std-namespace" >&5
++       echo "$as_me:18564: checking if iostream uses std-namespace" >&5
  echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
 -        cat >conftest.$ac_ext <<_ACEOF
 -#line 17363 "configure"
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 18422 "configure"
++#line 18567 "configure"
  #include "confdefs.h"
  
  #include <iostream>
-@@ -17377,16 +18436,16 @@
+@@ -17377,16 +18581,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18584: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17383: \$? = $ac_status" >&5
-+  echo "$as_me:18442: \$? = $ac_status" >&5
++  echo "$as_me:18587: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17386: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18590: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17389: \$? = $ac_status" >&5
-+  echo "$as_me:18448: \$? = $ac_status" >&5
++  echo "$as_me:18593: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_iostream_namespace=yes
  else
-@@ -17395,17 +18454,17 @@
+@@ -17395,17 +18599,17 @@
  cf_iostream_namespace=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -        echo "$as_me:17398: result: $cf_iostream_namespace" >&5
-+       echo "$as_me:18457: result: $cf_iostream_namespace" >&5
++       echo "$as_me:18602: result: $cf_iostream_namespace" >&5
  echo "${ECHO_T}$cf_iostream_namespace" >&6
 -        if test "$cf_iostream_namespace" = yes ; then
@@ -24623 +27895 @@
  
 -echo "$as_me:17408: checking if we should include stdbool.h" >&5
-+echo "$as_me:18467: checking if we should include stdbool.h" >&5
++echo "$as_me:18612: 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
-@@ -17413,7 +18472,7 @@
+@@ -17413,7 +18617,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17416 "configure"
-+#line 18475 "configure"
++#line 18620 "configure"
  #include "confdefs.h"
  
  int
-@@ -17425,23 +18484,23 @@
+@@ -17425,23 +18629,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18632: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17431: \$? = $ac_status" >&5
-+  echo "$as_me:18490: \$? = $ac_status" >&5
++  echo "$as_me:18635: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17434: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18638: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17437: \$? = $ac_status" >&5
-+  echo "$as_me:18496: \$? = $ac_status" >&5
++  echo "$as_me:18641: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=0
@@ -24661 +27933 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 17444 "configure"
-+#line 18503 "configure"
++#line 18648 "configure"
  #include "confdefs.h"
  
  #ifndef __BEOS__
-@@ -17457,16 +18516,16 @@
+@@ -17457,16 +18661,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17460: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18664: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17463: \$? = $ac_status" >&5
-+  echo "$as_me:18522: \$? = $ac_status" >&5
++  echo "$as_me:18667: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17466: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18525: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18670: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17469: \$? = $ac_status" >&5
-+  echo "$as_me:18528: \$? = $ac_status" >&5
++  echo "$as_me:18673: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=1
  else
-@@ -17480,13 +18539,13 @@
+@@ -17480,13 +18684,13 @@
  fi
  
  if test "$cf_cv_header_stdbool_h" = 1
 -then   echo "$as_me:17483: result: yes" >&5
-+then   echo "$as_me:18542: result: yes" >&5
++then   echo "$as_me:18687: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:17485: result: no" >&5
-+else   echo "$as_me:18544: result: no" >&5
++else   echo "$as_me:18689: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:17489: checking for builtin bool type" >&5
-+echo "$as_me:18548: checking for builtin bool type" >&5
++echo "$as_me:18693: 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
-@@ -17494,7 +18553,7 @@
+@@ -17494,7 +18698,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17497 "configure"
-+#line 18556 "configure"
++#line 18701 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17509,16 +18568,16 @@
+@@ -17509,16 +18713,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17512: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18716: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17515: \$? = $ac_status" >&5
-+  echo "$as_me:18574: \$? = $ac_status" >&5
++  echo "$as_me:18719: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18722: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17521: \$? = $ac_status" >&5
-+  echo "$as_me:18580: \$? = $ac_status" >&5
++  echo "$as_me:18725: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_builtin_bool=1
  else
-@@ -17531,13 +18590,13 @@
+@@ -17531,13 +18735,13 @@
  fi
  
  if test "$cf_cv_builtin_bool" = 1
 -then   echo "$as_me:17534: result: yes" >&5
-+then   echo "$as_me:18593: result: yes" >&5
++then   echo "$as_me:18738: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:17536: result: no" >&5
-+else   echo "$as_me:18595: result: no" >&5
++else   echo "$as_me:18740: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:17540: checking for size of bool" >&5
-+echo "$as_me:18599: checking for size of bool" >&5
++echo "$as_me:18744: checking for size of bool" >&5
  echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
  if test "${cf_cv_type_of_bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17548,7 +18607,7 @@
+@@ -17548,7 +18752,7 @@
    cf_cv_type_of_bool=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17551 "configure"
-+#line 18610 "configure"
++#line 18755 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -17590,15 +18649,15 @@
+@@ -17590,15 +18794,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:17593: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18797: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17596: \$? = $ac_status" >&5
-+  echo "$as_me:18655: \$? = $ac_status" >&5
++  echo "$as_me:18800: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18802: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17601: \$? = $ac_status" >&5
-+  echo "$as_me:18660: \$? = $ac_status" >&5
++  echo "$as_me:18805: \$? = $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
-@@ -17616,30 +18675,36 @@
+@@ -17616,30 +18820,36 @@
  fi
  
         rm -f cf_test.out
 -echo "$as_me:17619: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:18678: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:18823: 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
@@ -24791 +28063 @@
         esac
 -       { echo "$as_me:17625: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+       { echo "$as_me:18684: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++       { echo "$as_me:18829: 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
@@ -24797 +28069 @@
  
 -echo "$as_me:17630: checking for special defines needed for etip.h" >&5
-+echo "$as_me:18689: checking for special defines needed for etip.h" >&5
++echo "$as_me:18834: 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"
@@ -24817 +28089 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 17642 "configure"
-+#line 18707 "configure"
++#line 18852 "configure"
  #include "confdefs.h"
  
  #include <etip.h.in>
-@@ -17653,16 +18718,16 @@
+@@ -17653,16 +18863,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17656: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18866: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17659: \$? = $ac_status" >&5
-+  echo "$as_me:18724: \$? = $ac_status" >&5
++  echo "$as_me:18869: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17662: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18872: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17665: \$? = $ac_status" >&5
-+  echo "$as_me:18730: \$? = $ac_status" >&5
++  echo "$as_me:18875: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -17683,12 +18748,12 @@
+@@ -17674,7 +18884,7 @@
+ EOF
+ 
+        cf_result="$cf_math $cf_excp"
+-       break
++       break 2
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -17683,12 +18893,12 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
  done
 -echo "$as_me:17686: result: $cf_result" >&5
-+echo "$as_me:18751: result: $cf_result" >&5
++echo "$as_me:18896: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  CXXFLAGS="$cf_save_CXXFLAGS"
@@ -24853 +28134 @@
  if test -n "$CXX"; then
 -echo "$as_me:17691: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:18756: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:18901: 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
-@@ -17705,7 +18770,7 @@
+@@ -17705,7 +18915,7 @@
    cf_cv_cpp_param_init=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17708 "configure"
-+#line 18773 "configure"
++#line 18918 "configure"
  #include "confdefs.h"
  
  class TEST {
-@@ -17720,19 +18785,19 @@
+@@ -17720,19 +18930,19 @@
  {
         value = x;
@@ -24876 +28157 @@
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:17727: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17730: \$? = $ac_status" >&5
-+  echo "$as_me:18795: \$? = $ac_status" >&5
++  echo "$as_me:18940: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:17732: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18942: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17735: \$? = $ac_status" >&5
-+  echo "$as_me:18800: \$? = $ac_status" >&5
++  echo "$as_me:18945: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cpp_param_init=yes
  else
-@@ -17751,7 +18816,7 @@
+@@ -17751,7 +18961,7 @@
  ac_main_return=return
  
  fi
 -echo "$as_me:17754: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:18819: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:18964: result: $cf_cv_cpp_param_init" >&5
  echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
  fi
  test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
-@@ -17760,7 +18825,7 @@
+@@ -17760,7 +18970,7 @@
  
  if test -n "$CXX"; then
  
 -echo "$as_me:17763: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:18828: checking if $CXX accepts static_cast" >&5
++echo "$as_me:18973: 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
-@@ -17774,7 +18839,7 @@
+@@ -17774,7 +18984,7 @@
  ac_main_return=return
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17777 "configure"
-+#line 18842 "configure"
++#line 18987 "configure"
  #include "confdefs.h"
  
  class NCursesPanel
-@@ -17818,16 +18883,16 @@
+@@ -17818,16 +19028,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17821: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19031: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17824: \$? = $ac_status" >&5
-+  echo "$as_me:18889: \$? = $ac_status" >&5
++  echo "$as_me:19034: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19037: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17830: \$? = $ac_status" >&5
-+  echo "$as_me:18895: \$? = $ac_status" >&5
++  echo "$as_me:19040: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cpp_static_cast=yes
  else
-@@ -17845,7 +18910,7 @@
+@@ -17845,7 +19055,7 @@
  ac_main_return=return
  
  fi
 -echo "$as_me:17848: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:18913: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:19058: result: $cf_cv_cpp_static_cast" >&5
  echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
  
  fi
-@@ -17893,7 +18958,7 @@
+@@ -17893,7 +19103,7 @@
         else
                 if test "$cf_cv_header_stdbool_h" = 1 ; then
  
 -echo "$as_me:17896: checking for size of bool" >&5
-+echo "$as_me:18961: checking for size of bool" >&5
++echo "$as_me:19106: checking for size of bool" >&5
  echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
  if test "${cf_cv_type_of_bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17904,7 +18969,7 @@
+@@ -17904,7 +19114,7 @@
    cf_cv_type_of_bool=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17907 "configure"
-+#line 18972 "configure"
++#line 19117 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -17946,15 +19011,15 @@
+@@ -17946,15 +19156,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:17949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19159: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17952: \$? = $ac_status" >&5
-+  echo "$as_me:19017: \$? = $ac_status" >&5
++  echo "$as_me:19162: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:17954: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17957: \$? = $ac_status" >&5
-+  echo "$as_me:19022: \$? = $ac_status" >&5
++  echo "$as_me:19167: \$? = $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
-@@ -17972,25 +19037,25 @@
+@@ -17972,25 +19182,25 @@
  fi
  
         rm -f cf_test.out
 -echo "$as_me:17975: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:19040: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:19185: 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
@@ -24998 +28279 @@
         esac
 -       { echo "$as_me:17981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+       { echo "$as_me:19046: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++       { echo "$as_me:19191: 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
@@ -25005 +28286 @@
                 else
 -                       echo "$as_me:17987: checking for fallback type of bool" >&5
-+                       echo "$as_me:19052: checking for fallback type of bool" >&5
++                       echo "$as_me:19197: checking for fallback type of bool" >&5
  echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
                         case "$host_cpu" in #(vi
@@ -25012 +28293 @@
                         esac
 -                       echo "$as_me:17993: result: $cf_cv_type_of_bool" >&5
-+                       echo "$as_me:19058: result: $cf_cv_type_of_bool" >&5
++                       echo "$as_me:19203: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
                 fi
         fi
-@@ -18019,7 +19084,7 @@
+@@ -18019,7 +19229,7 @@
  
         if test "$cf_with_ada" != "no" ; then
                 if test "$with_libtool" != "no"; then
 -                       { echo "$as_me:18022: WARNING: libtool does not support Ada - disabling feature" >&5
-+                       { echo "$as_me:19087: WARNING: libtool does not support Ada - disabling feature" >&5
++                       { echo "$as_me:19232: 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
-@@ -18030,7 +19095,7 @@
+@@ -18030,7 +19240,7 @@
  cf_ada_make=gnatmake
  # Extract the first word of "$cf_ada_make", so it can be a program name with args.
  set dummy $cf_ada_make; ac_word=$2
 -echo "$as_me:18033: checking for $ac_word" >&5
-+echo "$as_me:19098: checking for $ac_word" >&5
++echo "$as_me:19243: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_gnat_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18045,7 +19110,7 @@
+@@ -18045,7 +19255,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_gnat_exists="yes"
 -echo "$as_me:18048: found $ac_dir/$ac_word" >&5
-+echo "$as_me:19113: found $ac_dir/$ac_word" >&5
++echo "$as_me:19258: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -18054,31 +19119,32 @@
+@@ -18054,31 +19264,32 @@
  fi
  gnat_exists=$ac_cv_prog_gnat_exists
  if test -n "$gnat_exists"; then
 -  echo "$as_me:18057: result: $gnat_exists" >&5
-+  echo "$as_me:19122: result: $gnat_exists" >&5
++  echo "$as_me:19267: result: $gnat_exists" >&5
  echo "${ECHO_T}$gnat_exists" >&6
  else
 -  echo "$as_me:18060: result: no" >&5
-+  echo "$as_me:19125: result: no" >&5
++  echo "$as_me:19270: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -25062 +28343 @@
  
 -echo "$as_me:18068: checking for gnat version" >&5
-+echo "$as_me:19134: checking for gnat version" >&5
++echo "$as_me:19279: checking for gnat version" >&5
  echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
  cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
@@ -25068 +28349 @@
      sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 -echo "$as_me:18073: result: $cf_gnat_version" >&5
-+echo "$as_me:19139: result: $cf_gnat_version" >&5
++echo "$as_me:19284: result: $cf_gnat_version" >&5
  echo "${ECHO_T}$cf_gnat_version" >&6
  
@@ -25078 +28359 @@
  *)
 -       { echo "$as_me:18081: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+       { echo "$as_me:19147: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++       { echo "$as_me:19292: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
  echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
         cf_cv_prog_gnat_correct=no
         ;;
-@@ -18086,7 +19152,7 @@
+@@ -18086,7 +19297,7 @@
  
     # Extract the first word of "m4", so it can be a program name with args.
  set dummy m4; ac_word=$2
 -echo "$as_me:18089: checking for $ac_word" >&5
-+echo "$as_me:19155: checking for $ac_word" >&5
++echo "$as_me:19300: 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
-@@ -18101,7 +19167,7 @@
+@@ -18101,7 +19312,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_M4_exists="yes"
 -echo "$as_me:18104: found $ac_dir/$ac_word" >&5
-+echo "$as_me:19170: found $ac_dir/$ac_word" >&5
++echo "$as_me:19315: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -18110,10 +19176,10 @@
+@@ -18110,10 +19321,10 @@
  fi
  M4_exists=$ac_cv_prog_M4_exists
  if test -n "$M4_exists"; then
 -  echo "$as_me:18113: result: $M4_exists" >&5
-+  echo "$as_me:19179: result: $M4_exists" >&5
++  echo "$as_me:19324: result: $M4_exists" >&5
  echo "${ECHO_T}$M4_exists" >&6
  else
 -  echo "$as_me:18116: result: no" >&5
-+  echo "$as_me:19182: result: no" >&5
++  echo "$as_me:19327: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -18122,7 +19188,7 @@
+@@ -18122,7 +19333,7 @@
        echo Ada95 binding required program m4 not found. Ada95 binding disabled.
     fi
     if test "$cf_cv_prog_gnat_correct" = yes; then
 -      echo "$as_me:18125: checking if GNAT works" >&5
-+      echo "$as_me:19191: checking if GNAT works" >&5
++      echo "$as_me:19336: checking if GNAT works" >&5
  echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
  
  rm -rf conftest* *~conftest*
-@@ -18150,7 +19216,7 @@
+@@ -18150,7 +19361,7 @@
  fi
  rm -rf conftest* *~conftest*
  
 -      echo "$as_me:18153: result: $cf_cv_prog_gnat_correct" >&5
-+      echo "$as_me:19219: result: $cf_cv_prog_gnat_correct" >&5
++      echo "$as_me:19364: result: $cf_cv_prog_gnat_correct" >&5
  echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
     fi
  fi
-@@ -18175,7 +19241,7 @@
-                                ;;
-                        esac
+@@ -18159,23 +19370,27 @@
+ 
+        ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-                       # make ADAFLAGS consistent with CFLAGS
+-                       case "$CFLAGS" in
+-                       *-g*)
++       echo "$as_me:19373: checking optimization options for ADAFLAGS" >&5
++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
++       case "$CFLAGS" in
++       *-g*)
+ 
+        ADAFLAGS="$ADAFLAGS -g"
+ 
+-                               ;;
+-                       esac
+-                       case "$CFLAGS" in
+-                       *-O*)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[         ].*//'`
+ 
+-       ADAFLAGS="$ADAFLAGS -O3"
++       ADAFLAGS="$ADAFLAGS $cf_O_flag"
+ 
+-                               ;;
+-                       esac
++               ;;
++       esac
++       echo "$as_me:19390: result: $ADAFLAGS" >&5
++echo "${ECHO_T}$ADAFLAGS" >&6
  
 -echo "$as_me:18178: checking if GNAT supports generics" >&5
-+echo "$as_me:19244: checking if GNAT supports generics" >&5
++echo "$as_me:19393: checking if GNAT supports generics" >&5
  echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[1-9]*|[4-9].*) #(vi
-@@ -18185,7 +19251,7 @@
+@@ -18185,7 +19400,7 @@
         cf_gnat_generics=no
         ;;
  esac
 -echo "$as_me:18188: result: $cf_gnat_generics" >&5
-+echo "$as_me:19254: result: $cf_gnat_generics" >&5
++echo "$as_me:19403: result: $cf_gnat_generics" >&5
  echo "${ECHO_T}$cf_gnat_generics" >&6
  
  if test "$cf_gnat_generics" = yes
-@@ -18197,7 +19263,7 @@
+@@ -18197,7 +19412,7 @@
         cf_generic_objects=
  fi
  
 -echo "$as_me:18200: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:19266: checking if GNAT supports SIGINT" >&5
++echo "$as_me:19415: 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
-@@ -18245,7 +19311,7 @@
+@@ -18245,7 +19460,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:18248: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:19314: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:19463: result: $cf_cv_gnat_sigint" >&5
  echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
  
  if test $cf_cv_gnat_sigint = yes ; then
-@@ -18254,7 +19320,7 @@
+@@ -18254,7 +19469,7 @@
         USE_GNAT_SIGINT="#"
  fi
  
 -echo "$as_me:18257: checking if GNAT pragma Unreferenced works" >&5
-+echo "$as_me:19323: checking if GNAT pragma Unreferenced works" >&5
++echo "$as_me:19472: checking if GNAT pragma Unreferenced works" >&5
  echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
  if test "${cf_cv_pragma_unreferenced+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18285,7 +19351,7 @@
+@@ -18285,7 +19500,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:18288: result: $cf_cv_pragma_unreferenced" >&5
-+echo "$as_me:19354: result: $cf_cv_pragma_unreferenced" >&5
++echo "$as_me:19503: result: $cf_cv_pragma_unreferenced" >&5
  echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
  
  # if the pragma is supported, use it (needed in the Trace code).
-@@ -18298,7 +19364,7 @@
+@@ -18298,7 +19513,7 @@
  cf_gnat_libraries=no
  cf_gnat_projects=no
  
 -echo "$as_me:18301: checking if GNAT supports project files" >&5
-+echo "$as_me:19367: checking if GNAT supports project files" >&5
++echo "$as_me:19516: checking if GNAT supports project files" >&5
  echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[0-9]*) #(vi
-@@ -18366,14 +19432,14 @@
+@@ -18366,14 +19581,14 @@
         esac
         ;;
  esac
 -echo "$as_me:18369: result: $cf_gnat_projects" >&5
-+echo "$as_me:19435: result: $cf_gnat_projects" >&5
++echo "$as_me:19584: result: $cf_gnat_projects" >&5
  echo "${ECHO_T}$cf_gnat_projects" >&6
  
@@ -25205 +28516 @@
  then
 -       echo "$as_me:18374: checking if GNAT supports libraries" >&5
-+       echo "$as_me:19440: checking if GNAT supports libraries" >&5
++       echo "$as_me:19589: checking if GNAT supports libraries" >&5
  echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 -       echo "$as_me:18376: result: $cf_gnat_libraries" >&5
-+       echo "$as_me:19442: result: $cf_gnat_libraries" >&5
++       echo "$as_me:19591: result: $cf_gnat_libraries" >&5
  echo "${ECHO_T}$cf_gnat_libraries" >&6
  fi
  
-@@ -18393,7 +19459,7 @@
+@@ -18393,7 +19608,7 @@
         USE_GNAT_LIBRARIES="#"
  fi
  
 -echo "$as_me:18396: checking for ada-compiler" >&5
-+echo "$as_me:19462: checking for ada-compiler" >&5
++echo "$as_me:19611: 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.
-@@ -18404,12 +19470,12 @@
+@@ -18404,12 +19619,12 @@
    cf_ada_compiler=gnatmake
  fi;
  
 -echo "$as_me:18407: result: $cf_ada_compiler" >&5
-+echo "$as_me:19473: result: $cf_ada_compiler" >&5
++echo "$as_me:19622: result: $cf_ada_compiler" >&5
  echo "${ECHO_T}$cf_ada_compiler" >&6
  
@@ -25232 +28543 @@
  
 -echo "$as_me:18412: checking for ada-include" >&5
-+echo "$as_me:19478: checking for ada-include" >&5
++echo "$as_me:19627: 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.
-@@ -18445,7 +19511,7 @@
+@@ -18433,7 +19648,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -18445,7 +19660,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:18448: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:19514: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:19663: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -18454,10 +19520,10 @@
+@@ -18454,10 +19669,10 @@
  fi
  ADA_INCLUDE="$withval"
  
 -echo "$as_me:18457: result: $ADA_INCLUDE" >&5
-+echo "$as_me:19523: result: $ADA_INCLUDE" >&5
++echo "$as_me:19672: result: $ADA_INCLUDE" >&5
  echo "${ECHO_T}$ADA_INCLUDE" >&6
  
 -echo "$as_me:18460: checking for ada-objects" >&5
-+echo "$as_me:19526: checking for ada-objects" >&5
++echo "$as_me:19675: 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.
-@@ -18493,7 +19559,7 @@
+@@ -18481,7 +19696,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -18493,7 +19708,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:18496: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:19562: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:19711: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -18502,10 +19568,10 @@
+@@ -18502,10 +19717,10 @@
  fi
  ADA_OBJECTS="$withval"
  
 -echo "$as_me:18505: result: $ADA_OBJECTS" >&5
-+echo "$as_me:19571: result: $ADA_OBJECTS" >&5
++echo "$as_me:19720: result: $ADA_OBJECTS" >&5
  echo "${ECHO_T}$ADA_OBJECTS" >&6
  
 -echo "$as_me:18508: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:19574: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:19723: 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.
-@@ -18515,7 +19581,7 @@
+@@ -18515,7 +19730,7 @@
  else
    with_ada_sharedlib=no
  fi;
 -echo "$as_me:18518: result: $with_ada_sharedlib" >&5
-+echo "$as_me:19584: result: $with_ada_sharedlib" >&5
++echo "$as_me:19733: result: $with_ada_sharedlib" >&5
  echo "${ECHO_T}$with_ada_sharedlib" >&6
  
  ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -18546,7 +19612,7 @@
+@@ -18546,7 +19761,7 @@
  ### chooses to split module lists into libraries.
  ###
  ### (see CF_LIB_RULES).
 -echo "$as_me:18549: checking for library subsets" >&5
-+echo "$as_me:19615: checking for library subsets" >&5
++echo "$as_me:19764: checking for library subsets" >&5
  echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
  LIB_SUBSETS=
  
-@@ -18587,7 +19653,7 @@
+@@ -18587,7 +19802,7 @@
  test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
  test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
  
 -echo "$as_me:18590: result: $LIB_SUBSETS" >&5
-+echo "$as_me:19656: result: $LIB_SUBSETS" >&5
++echo "$as_me:19805: result: $LIB_SUBSETS" >&5
  echo "${ECHO_T}$LIB_SUBSETS" >&6
  
  ### Construct the list of include-directories to be generated
-@@ -18625,7 +19691,7 @@
+@@ -18625,7 +19840,7 @@
  fi
  
  ### Build up pieces for makefile rules
 -echo "$as_me:18628: checking default library suffix" >&5
-+echo "$as_me:19694: checking default library suffix" >&5
++echo "$as_me:19843: checking default library suffix" >&5
  echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -18636,10 +19702,10 @@
+@@ -18636,10 +19851,10 @@
         shared)  DFT_ARG_SUFFIX=''   ;;
         esac
         test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
 -echo "$as_me:18639: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:19705: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:19854: result: $DFT_ARG_SUFFIX" >&5
  echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
  
 -echo "$as_me:18642: checking default library-dependency suffix" >&5
-+echo "$as_me:19708: checking default library-dependency suffix" >&5
++echo "$as_me:19857: checking default library-dependency suffix" >&5
  echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in #(vi
-@@ -18661,7 +19727,7 @@
+@@ -18661,11 +19876,11 @@
                 ;;
         shared) #(vi
@@ -25338 +28667 @@
                         DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                         ;;
-@@ -18692,10 +19758,10 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        DFT_LIB_SUFFIX='.dll'
+                        DFT_DEP_SUFFIX='.dll.a'
+                        ;;
+@@ -18692,10 +19907,10 @@
         esac
         test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
         test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
 -echo "$as_me:18695: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:19761: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:19910: result: $DFT_DEP_SUFFIX" >&5
  echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
  
 -echo "$as_me:18698: checking default object directory" >&5
-+echo "$as_me:19764: checking default object directory" >&5
++echo "$as_me:19913: checking default object directory" >&5
  echo $ECHO_N "checking default object directory... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -18711,12 +19777,12 @@
+@@ -18711,12 +19926,12 @@
                         DFT_OBJ_SUBDIR='obj_s' ;;
                 esac
         esac
 -echo "$as_me:18714: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:19780: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:19929: result: $DFT_OBJ_SUBDIR" >&5
  echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
  
@@ -25362 +28696 @@
  if test "$cf_with_cxx" = yes ; then
 -echo "$as_me:18719: checking c++ library-dependency suffix" >&5
-+echo "$as_me:19785: checking c++ library-dependency suffix" >&5
++echo "$as_me:19934: checking c++ library-dependency suffix" >&5
  echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
  if test "$with_libtool" != "no"; then
         CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
-@@ -18741,7 +19807,7 @@
+@@ -18741,11 +19956,11 @@
                 ;;
         shared) #(vi
@@ -25375 +28709 @@
                         CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                         ;;
-@@ -18773,7 +19839,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        CXX_LIB_SUFFIX='.dll'
+                        CXX_DEP_SUFFIX='.dll.a'
+                        ;;
+@@ -18773,7 +19988,7 @@
         test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
         test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
  fi
 -echo "$as_me:18776: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:19842: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:19991: result: $CXX_LIB_SUFFIX" >&5
  echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
  
  fi
-@@ -18812,9 +19878,11 @@
+@@ -18812,9 +20027,11 @@
                 TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
                 TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
@@ -25398 +28737 @@
  
  if test "$with_termlib" != no ; then
-@@ -18837,14 +19905,22 @@
+@@ -18837,14 +20054,22 @@
         if test "$DFT_LWR_MODEL" = "libtool"; then
                 TEST_ARGS="${TEST_DEPS}"
@@ -25424 +28763 @@
         fi
  else
-@@ -18858,7 +19934,8 @@
+@@ -18858,7 +20083,8 @@
                 TICS_LIST="$SHLIB_LIST"
         fi
@@ -25434 +28773 @@
  
  if test "$DFT_LWR_MODEL" = shared ; then
-@@ -18882,7 +19959,7 @@
+@@ -18882,7 +20108,7 @@
  fi
  
@@ -25443 +28782 @@
  case $DFT_LWR_MODEL in
  normal|debug|profile)
-@@ -18900,7 +19977,7 @@
+@@ -18900,7 +20126,7 @@
      esac
  else
@@ -25452 +28791 @@
                 LDFLAGS_SHARED=-bdynamic
                 ;;
-@@ -18927,19 +20004,19 @@
+@@ -18927,19 +20153,19 @@
  
  if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
  then
 -       echo "$as_me:18930: checking if linker supports switching between static/dynamic" >&5
-+       echo "$as_me:20007: checking if linker supports switching between static/dynamic" >&5
++       echo "$as_me:20156: checking if linker supports switching between static/dynamic" >&5
  echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
  
@@ -25463 +28802 @@
         cat >conftest.$ac_ext <<EOF
 -#line 18935 "configure"
-+#line 20012 "configure"
++#line 20161 "configure"
  #include <stdio.h>
  int cf_ldflags_static(FILE *fp) { return fflush(fp); }
  EOF
 -       if { (eval echo "$as_me:18939: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:20016: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:20165: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:18942: \$? = $ac_status" >&5
-+  echo "$as_me:20019: \$? = $ac_status" >&5
++  echo "$as_me:20168: \$? = $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
-@@ -18950,10 +20027,10 @@
+@@ -18950,10 +20176,10 @@
  
         LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 -#line 18953 "configure"
-+#line 20030 "configure"
++#line 20179 "configure"
  #include "confdefs.h"
  
 -#line 18956 "configure"
-+#line 20033 "configure"
++#line 20182 "configure"
  #include <stdio.h>
  int cf_ldflags_static(FILE *fp);
  
-@@ -18968,18 +20045,28 @@
+@@ -18968,18 +20194,28 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:18971: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20048: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20197: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:18974: \$? = $ac_status" >&5
-+  echo "$as_me:20051: \$? = $ac_status" >&5
++  echo "$as_me:20200: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:18977: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20203: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:18980: \$? = $ac_status" >&5
-+  echo "$as_me:20057: \$? = $ac_status" >&5
++  echo "$as_me:20206: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_ldflags_static=yes
@@ -25523 +28862 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-@@ -18990,7 +20077,7 @@
+@@ -18990,7 +20226,7 @@
         rm -f libconftest.*
         LIBS="$cf_save_LIBS"
  
 -       echo "$as_me:18993: result: $cf_ldflags_static" >&5
-+       echo "$as_me:20080: result: $cf_ldflags_static" >&5
++       echo "$as_me:20229: result: $cf_ldflags_static" >&5
  echo "${ECHO_T}$cf_ldflags_static" >&6
  
         if test $cf_ldflags_static != yes
-@@ -19006,12 +20093,12 @@
+@@ -19006,12 +20242,12 @@
         ;;
  esac
  
 -echo "$as_me:19009: checking where we will install curses.h" >&5
-+echo "$as_me:20096: checking where we will install curses.h" >&5
++echo "$as_me:20245: checking where we will install curses.h" >&5
  echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
  test "$with_overwrite" = no && \
@@ -25543 +28882 @@
         includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
 -echo "$as_me:19014: result: $includedir" >&5
-+echo "$as_me:20101: result: $includedir" >&5
++echo "$as_me:20250: result: $includedir" >&5
  echo "${ECHO_T}$includedir" >&6
  
  ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -19019,7 +20106,7 @@
+@@ -19019,7 +20255,7 @@
  if test "$with_overwrite" != no ; then
  if test "$NCURSES_LIBUTF8" = 1 ; then
         NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
 -       { echo "$as_me:19022: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+       { echo "$as_me:20109: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++       { echo "$as_me:20258: 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
-@@ -19036,7 +20123,7 @@
+@@ -19036,7 +20272,7 @@
  ### Construct the list of subdirectories for which we'll customize makefiles
  ### with the appropriate compile-rules.
  
 -echo "$as_me:19039: checking for src modules" >&5
-+echo "$as_me:20126: checking for src modules" >&5
++echo "$as_me:20275: checking for src modules" >&5
  echo $ECHO_N "checking for src modules... $ECHO_C" >&6
  
  # dependencies and linker-arguments for test-programs
-@@ -19050,6 +20137,7 @@
+@@ -19050,6 +20286,7 @@
         TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
  fi
@@ -25573 +28912 @@
  for cf_dir in $modules_to_build
  do
-@@ -19096,10 +20184,11 @@
+@@ -19096,10 +20333,11 @@
                                 TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
                                 TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2"
@@ -25582 +28921 @@
  done
 -echo "$as_me:19102: result: $cf_cv_src_modules" >&5
-+echo "$as_me:20191: result: $cf_cv_src_modules" >&5
++echo "$as_me:20340: result: $cf_cv_src_modules" >&5
  echo "${ECHO_T}$cf_cv_src_modules" >&6
  
  TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -19118,10 +20207,16 @@
+@@ -19118,10 +20356,16 @@
         SRC_SUBDIRS="$SRC_SUBDIRS test"
  fi
@@ -25605 +28944 @@
         ADA_SUBDIRS="gen src"
         if test "x$cf_with_tests" != "xno" ; then
-@@ -19143,7 +20238,7 @@
+@@ -19143,7 +20387,7 @@
  
  fi
@@ -25614 +28953 @@
     SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in"
  fi
-@@ -19305,7 +20400,7 @@
+@@ -19305,7 +20549,7 @@
  
  # Extract the first word of "tic", so it can be a program name with args.
  set dummy tic; ac_word=$2
 -echo "$as_me:19308: checking for $ac_word" >&5
-+echo "$as_me:20403: checking for $ac_word" >&5
++echo "$as_me:20552: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_TIC_PATH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19322,7 +20417,7 @@
+@@ -19322,7 +20566,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
 -   echo "$as_me:19325: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:20420: found $ac_dir/$ac_word" >&5
++   echo "$as_me:20569: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -19334,10 +20429,10 @@
+@@ -19334,10 +20578,10 @@
  TIC_PATH=$ac_cv_path_TIC_PATH
  
  if test -n "$TIC_PATH"; then
 -  echo "$as_me:19337: result: $TIC_PATH" >&5
-+  echo "$as_me:20432: result: $TIC_PATH" >&5
++  echo "$as_me:20581: result: $TIC_PATH" >&5
  echo "${ECHO_T}$TIC_PATH" >&6
  else
 -  echo "$as_me:19340: result: no" >&5
-+  echo "$as_me:20435: result: no" >&5
++  echo "$as_me:20584: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -19345,7 +20440,7 @@
+@@ -19345,7 +20589,7 @@
  then
         if test "$TIC_PATH" = unknown
         then
 -               { echo "$as_me:19348: WARNING: no tic program found for fallbacks" >&5
-+               { echo "$as_me:20443: WARNING: no tic program found for fallbacks" >&5
++               { echo "$as_me:20592: WARNING: no tic program found for fallbacks" >&5
  echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
         fi
  fi
-@@ -19359,11 +20454,6 @@
+@@ -19359,11 +20603,6 @@
  ADAHTML_DIR=../../doc/html/ada
  
@@ -25666 +29005 @@
  ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile"
  ac_config_commands="$ac_config_commands default"
-@@ -19446,7 +20536,7 @@
+@@ -19446,7 +20685,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ echo "$as_me:19449: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:20539: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:20688: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -19622,7 +20712,7 @@
+@@ -19578,7 +20817,7 @@
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20101002,
++configured by $0, generated by GNU Autoconf 2.52.20120811,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -19622,7 +20861,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
 -    { { echo "$as_me:19625: error: ambiguous option: $1
-+    { { echo "$as_me:20715: error: ambiguous option: $1
++    { { echo "$as_me:20864: 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;}
-@@ -19641,7 +20731,7 @@
+@@ -19641,7 +20880,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
 -  -*) { { echo "$as_me:19644: error: unrecognized option: $1
-+  -*) { { echo "$as_me:20734: error: unrecognized option: $1
++  -*) { { echo "$as_me:20883: 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;}
-@@ -19686,6 +20776,7 @@
+@@ -19660,7 +20899,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20101002, executed with
++This file was extended by $as_me 2.52.20120811, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -19682,10 +20921,11 @@
+ AWK="$AWK"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
+ DFT_LWR_MODEL="$DFT_LWR_MODEL"
+-ECHO_LINK="$ECHO_LINK"
++ECHO_LD="$ECHO_LD"
  LDCONFIG="$LDCONFIG"
  LIBTOOL_VERSION="$LIBTOOL_VERSION"
@@ -25701 +29063 @@
  LIB_SUFFIX="$LIB_SUFFIX"
  LIB_TRACING="$LIB_TRACING"
-@@ -19717,12 +20808,14 @@
+@@ -19707,7 +20947,7 @@
+ TINFO_SUFFIX="$TINFO_SUFFIX"
+ USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
+ WITH_CURSES_H="$with_curses_h"
+-WITH_ECHO="$with_echo"
++WITH_ECHO="${enable_echo:=yes}"
+ WITH_OVERWRITE="$with_overwrite"
+ cf_LIST_MODELS="$cf_list_models"
+ cf_cv_abi_version="$cf_cv_abi_version"
+@@ -19717,12 +20957,14 @@
  cf_cv_enable_opaque="$cf_cv_enable_opaque"
  cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
@@ -25716 +29087 @@
  cf_with_cxx_binding="$cf_with_cxx_binding"
  cf_with_manpages="$cf_with_manpages"
-@@ -19747,7 +20840,7 @@
+@@ -19747,7 +20989,7 @@
    "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:19750: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:20843: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:20992: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -19931,10 +21024,12 @@
+@@ -19806,6 +21048,7 @@
+ s,@bindir@,$bindir,;t t
+ s,@sbindir@,$sbindir,;t t
+ s,@libexecdir@,$libexecdir,;t t
++s,@datarootdir@,$datarootdir,;t t
+ s,@datadir@,$datadir,;t t
+ s,@sysconfdir@,$sysconfdir,;t t
+ s,@sharedstatedir@,$sharedstatedir,;t t
+@@ -19931,10 +21174,12 @@
  s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
  s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
@@ -25738 +29117 @@
  s,@TERMINFO@,$TERMINFO,;t t
  s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t
-@@ -20015,12 +21110,14 @@
+@@ -19955,6 +21200,7 @@
+ s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t
+ s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
+ s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t
++s,@NCURSES_TPARM_ARG@,$NCURSES_TPARM_ARG,;t t
+ s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
+ s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
+ s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
+@@ -19972,6 +21218,11 @@
+ s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
+ s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t
+ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
++s,@ECHO_LT@,$ECHO_LT,;t t
++s,@ECHO_LD@,$ECHO_LD,;t t
++s,@RULE_CC@,$RULE_CC,;t t
++s,@SHOW_CC@,$SHOW_CC,;t t
++s,@ECHO_CC@,$ECHO_CC,;t t
+ s,@ECHO_LINK@,$ECHO_LINK,;t t
+ s,@ADAFLAGS@,$ADAFLAGS,;t t
+ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
+@@ -20015,12 +21266,14 @@
  s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t
  s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t
@@ -25756 +29155 @@
  s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t
  s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
-@@ -20032,6 +21129,7 @@
+@@ -20032,6 +21285,7 @@
  s,@TEST_DEPS@,$TEST_DEPS,;t t
  s,@TEST_ARG2@,$TEST_ARG2,;t t
@@ -25764 +29163 @@
  s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t
  s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t
-@@ -20157,7 +21255,7 @@
+@@ -20157,7 +21411,7 @@
    esac
  
    if test x"$ac_file" != x-; then
 -    { echo "$as_me:20160: creating $ac_file" >&5
-+    { echo "$as_me:21258: creating $ac_file" >&5
++    { echo "$as_me:21414: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -20175,7 +21273,7 @@
+@@ -20175,7 +21429,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:20178: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:21276: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:21432: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -20188,7 +21286,7 @@
+@@ -20188,7 +21442,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:20191: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:21289: error: cannot find input file: $f" >&5
++           { { echo "$as_me:21445: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -20254,7 +21352,7 @@
+@@ -20254,7 +21508,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
 -  test x"$ac_file" != x- && { echo "$as_me:20257: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:21355: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:21511: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -20265,7 +21363,7 @@
+@@ -20265,7 +21519,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:20268: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:21366: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:21522: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -20278,7 +21376,7 @@
+@@ -20278,7 +21532,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:20281: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:21379: error: cannot find input file: $f" >&5
++           { { echo "$as_me:21535: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -20336,7 +21434,7 @@
+@@ -20336,7 +21590,7 @@
    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:20339: $ac_file is unchanged" >&5
-+      { echo "$as_me:21437: $ac_file is unchanged" >&5
++      { echo "$as_me:21593: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -20400,13 +21498,6 @@
+@@ -20394,25 +21648,20 @@
+        if test ! -d $srcdir/$cf_dir; then
+                continue
+        elif test -f $srcdir/$cf_dir/programs; then
+-               $AWK -f $srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LINK" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
++               $AWK -f $srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
+        fi
+ done
  
  fi
@@ -25840 +29246 @@
  cf_prefix=$LIB_PREFIX
  
- if test $cf_cv_shlib_version = cygdll ; then
-@@ -20461,7 +21552,7 @@
+-if test $cf_cv_shlib_version = cygdll ; then
++case $cf_cv_shlib_version in #(vi
++cygdll|mingw)
+        TINFO_NAME=$TINFO_ARG_SUFFIX
+        TINFO_SUFFIX=.dll
+-fi
++       ;;
++esac
+ 
+ if test -n "$TINFO_SUFFIX" ; then
+        case $TINFO_SUFFIX in
+@@ -20461,11 +21710,11 @@
                 ;;
         shared) #(vi
@@ -25850 +29266 @@
                         cf_depsuf=$cf_suffix
                         ;;
-@@ -20628,7 +21719,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        cf_suffix='.dll'
+                        cf_depsuf='.dll.a'
+                        ;;
+@@ -20549,11 +21798,18 @@
+                        # 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.
+-                       if test $cf_cv_shlib_version = cygdll ; then
++                       case $cf_cv_shlib_version in #(vi
++                       cygdll) #(vi
+                                cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                                LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"
+                                continue
+-                       fi
++                               ;;
++                       mingw)
++                               cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
++                               LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}"
++                               continue
++                               ;;
++                       esac
+                        fi
+                        LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
+                done
+@@ -20597,7 +21853,7 @@
+                mv $cf_dir/Makefile.out $cf_dir/Makefile
+ 
+                $AWK -f $srcdir/mk-0th.awk \
+-                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \
++                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
+                        $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+ 
+                for cf_subset in $cf_subsets
+@@ -20628,11 +21884,11 @@
                 ;;
         shared) #(vi
@@ -25859 +29310 @@
                         cf_depsuf=$cf_suffix
                         ;;
-@@ -20743,6 +21834,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        cf_suffix='.dll'
+                        cf_depsuf='.dll.a'
+                        ;;
+@@ -20743,6 +21999,7 @@
                                 prefix=$cf_prefix \
                                 suffix=$cf_suffix \
@@ -25867 +29323 @@
                                 TermlibRoot=$TINFO_NAME \
                                 TermlibSuffix=$TINFO_SUFFIX \
-@@ -20979,7 +22071,7 @@
+@@ -20979,7 +22236,7 @@
         fi
  done
@@ -25877 +29333 @@
  fi
 diff -Naur ncurses-5.9.orig/configure.in ncurses-5.9/configure.in
---- ncurses-5.9.orig/configure.in       2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/configure.in    2012-02-16 18:25:13.287826611 +0000
+--- ncurses-5.9.orig/configure.in       2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/configure.in    2012-08-25 19:58:02.196554389 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -25891 +29347 @@
  dnl
 -dnl $Id: configure.in,v 1.520 2011/03/28 00:22:26 tom Exp $
-+dnl $Id: configure.in,v 1.541 2012/02/11 20:24:11 tom Exp $
++dnl $Id: configure.in,v 1.552 2012/08/04 14:52:27 tom Exp $
  dnl Process this file with autoconf to produce a configure script.
  dnl
@@ -25899 +29355 @@
  AC_PREREQ(2.13.20020210)
 -AC_REVISION($Revision: 1.520 $)
-+AC_REVISION($Revision: 1.541 $)
++AC_REVISION($Revision: 1.552 $)
  AC_INIT(ncurses/base/lib_initscr.c)
  AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
  
-@@ -168,28 +168,8 @@
+@@ -58,7 +58,18 @@
+ CF_CFG_DEFAULTS
+ 
+ ###    Checks for programs.
+-AC_PROG_CC
++AC_ARG_WITH(ada,
++       [  --without-ada           suppress check for Ada95, don't build demo],
++       [cf_with_ada=$withval],
++       [cf_with_ada=yes])
++if test x"$cf_with_ada" = xyes
++then
++       cf_PROG_CC="gnatgcc gcc cc"
++else
++       cf_PROG_CC="gcc cc"
++fi
++
++AC_PROG_CC($cf_PROG_CC)
+ CF_GCC_VERSION
+ 
+ AC_PROG_CPP
+@@ -89,14 +100,16 @@
+                cf_with_cxx=no; CXX=""; GXX="";])dnl
+        AC_PROG_CXX
+        popdef([AC_MSG_ERROR])dnl
+-       # autoconf 2.5x removed the error - by hardcoding it to g++.
++       # autoconf 2.5x removed the error (hardcoding it to g++, or just blank)
+        if test "$CXX" = "g++" ; then
+                AC_PATH_PROG(CXX,g++)
+        fi
+-       if test "$CXX" = "g++" ; then
+-               AC_MSG_WARN(ignoring hardcoded g++)
++       case "x$CXX" in #(vi
++       x|xg++)
++               AC_MSG_WARN([You don't have any C++ compiler, too bad])
+                cf_with_cxx=no; CXX=""; GXX="";
+-       fi
++               ;;
++       esac
+ fi
+ 
+ CF_GXX_VERSION
+@@ -116,10 +129,6 @@
+ AC_MSG_RESULT($cf_with_cxx_binding)
+ 
+ AC_MSG_CHECKING(if you want to build with Ada95)
+-AC_ARG_WITH(ada,
+-       [  --without-ada           suppress check for Ada95, don't build demo],
+-       [cf_with_ada=$withval],
+-       [cf_with_ada=yes])
+ AC_MSG_RESULT($cf_with_ada)
+ 
+ AC_MSG_CHECKING(if you want to install manpages)
+@@ -168,28 +177,8 @@
  
  # if we find pkg-config, check if we should install the ".pc" files.
@@ -25934 +29442 @@
  AC_MSG_CHECKING(if we should assume mixed-case filenames)
  AC_ARG_ENABLE(mixed-case,
-@@ -321,9 +301,7 @@
+@@ -321,9 +310,7 @@
  LIB_DIR=../lib
  LIB_2ND=../../lib
@@ -25945 +29453 @@
  LIB_SUFFIX=
  AC_SUBST(LIB_SUFFIX)
-@@ -453,7 +431,6 @@
+@@ -453,7 +440,6 @@
  esac
  AC_SUBST(TERMINFO_SRC)
@@ -25953 +29461 @@
         AC_DEFINE(USE_DATABASE)
  
-@@ -494,6 +471,26 @@
+@@ -494,6 +480,26 @@
  WHICH_XTERM=$with_xterm_new
  AC_SUBST(WHICH_XTERM)
@@ -25980 +29488 @@
  if test "$use_database" = no ; then
         TERMINFO="${datadir}/terminfo"
-@@ -721,14 +718,9 @@
+@@ -721,14 +727,9 @@
  if test "$with_widec" = yes ; then
         LIB_SUFFIX="w${LIB_SUFFIX}"
@@ -25997 +29505 @@
         # with_overwrite=no
         NCURSES_CH_T=cchar_t
-@@ -883,12 +875,15 @@
+@@ -859,6 +860,15 @@
+ AC_MSG_RESULT($NCURSES_CCHARW_MAX)
+ AC_SUBST(NCURSES_CCHARW_MAX)
+ 
++###   use option --with-tparm-arg to override tparm's argument type
++AC_MSG_CHECKING(for type of tparm args)
++AC_ARG_WITH(tparm-arg,
++       [  --with-tparm-arg=TYPE   override parameter type of tparm],
++       [NCURSES_TPARM_ARG="$withval"],
++       [NCURSES_TPARM_ARG=long])
++AC_MSG_RESULT($NCURSES_TPARM_ARG)
++AC_SUBST(NCURSES_TPARM_ARG)
++
+ ### Enable compiling-in rcs id's
+ AC_MSG_CHECKING(if RCS identifiers should be compiled-in)
+ AC_ARG_WITH(rcs-ids,
+@@ -883,12 +893,15 @@
  AC_MSG_RESULT($with_ext_funcs)
  if test "$with_ext_funcs" = yes ; then
@@ -26013 +29537 @@
         AC_DEFINE(NCURSES_EXT_FUNCS)
         GENERATED_EXT_FUNCS=generated
-@@ -1344,6 +1339,8 @@
+@@ -1211,19 +1224,14 @@
+ CF_HELP_MESSAGE(Testing/development Options:)
+ 
+ ###    use option --disable-echo to suppress full display compiling commands
+-AC_MSG_CHECKING(if you want to display full commands during build)
+-AC_ARG_ENABLE(echo,
+-       [  --enable-echo           build: display "compiling" commands (default)],
+-       [with_echo=$enableval],
+-       [with_echo=yes])
+-if test "$with_echo" = yes; then
++CF_DISABLE_ECHO
++if test "$enable_echo" = yes; then
+        ECHO_LINK=
+ else
+        ECHO_LINK='@ echo linking $@ ... ;'
+        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
+        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
+ fi
+-AC_MSG_RESULT($with_echo)
+ AC_SUBST(ECHO_LINK)
+ 
+ ###    use option --enable-warnings to turn on all gcc warnings
+@@ -1241,6 +1249,7 @@
+        fi
+ fi
+ CF_GCC_ATTRIBUTES
++CF_ENABLE_STRING_HACKS
+ 
+ ###    use option --enable-assertions to turn on generation of assertion code
+ AC_MSG_CHECKING(if you want to enable runtime assertions)
+@@ -1253,7 +1262,6 @@
+ then
+        if test "$with_assertions" = no
+        then
+-               AC_DEFINE(NDEBUG)
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+                CF_ADD_ADAFLAGS(-gnata)
+@@ -1344,6 +1352,8 @@
  wctype.h \
  )
@@ -26022 +29584 @@
  # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
  if test "$ISC" = yes ; then
-@@ -1427,6 +1424,7 @@
+@@ -1393,10 +1403,12 @@
+ getttynam \
+ issetugid \
+ poll \
++putenv \
+ remove \
+ select \
+ setbuf \
+ setbuffer \
++setenv \
+ setvbuf \
+ sigaction \
+ sigvec \
+@@ -1427,6 +1439,7 @@
         AC_FUNC_SETVBUF_REVERSED
  fi
@@ -26030 +29605 @@
  CF_SIZECHANGE
  CF_FUNC_MEMMOVE
-@@ -1478,50 +1476,14 @@
+@@ -1478,50 +1491,14 @@
                 ;;
         esac
@@ -26084 +29659 @@
         cf_cxx_library=no
         cf_cv_builtin_bool=1
-@@ -1739,14 +1701,17 @@
+@@ -1595,18 +1572,7 @@
+                CF_PROG_GNAT
+                if test "$cf_cv_prog_gnat_correct" = yes; then
+                        CF_ADD_ADAFLAGS(-gnatpn)
+-
+-                       # make ADAFLAGS consistent with CFLAGS
+-                       case "$CFLAGS" in
+-                       *-g*)
+-                               CF_ADD_ADAFLAGS(-g)
+-                               ;;
+-                       esac
+-                       case "$CFLAGS" in
+-                       *-O*)
+-                               CF_ADD_ADAFLAGS(-O3)
+-                               ;;
+-                       esac
++                       CF_FIXUP_ADAFLAGS
+ 
+                        CF_GNAT_GENERICS
+                        CF_GNAT_SIGINT
+@@ -1739,14 +1705,17 @@
                 TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
                 TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
@@ -26105 +29700 @@
  if test "$with_termlib" != no ; then
  
-@@ -1768,14 +1733,22 @@
+@@ -1768,14 +1737,22 @@
         if test "$DFT_LWR_MODEL" = "libtool"; then
                 TEST_ARGS="${TEST_DEPS}"
@@ -26131 +29726 @@
         fi
  else
-@@ -1789,7 +1762,8 @@
+@@ -1789,7 +1766,8 @@
                 TICS_LIST="$SHLIB_LIST"
         fi
@@ -26141 +29736 @@
  
  if test "$DFT_LWR_MODEL" = shared ; then
-@@ -1804,7 +1778,8 @@
+@@ -1804,7 +1782,8 @@
  AC_SUBST(TINFO_ARG_SUFFIX)
  AC_SUBST(TINFO_DEP_SUFFIX)
@@ -26151 +29746 @@
  if test "$with_dlsym" = yes ; then
         CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
-@@ -1815,8 +1790,8 @@
+@@ -1815,8 +1794,8 @@
  fi
  
@@ -26162 +29757 @@
  case $DFT_LWR_MODEL in
  normal|debug|profile)
-@@ -1857,7 +1832,7 @@
+@@ -1857,7 +1836,7 @@
  
  CF_SRC_MODULES($modules_to_build)
@@ -26171 +29766 @@
     SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in"
  fi
-@@ -1918,11 +1893,6 @@
+@@ -1918,11 +1897,6 @@
  AC_SUBST(ADAHTML_DIR)
  
@@ -26183 +29778 @@
  AC_OUTPUT( \
         include/MKterm.h.awk \
-@@ -1938,7 +1908,7 @@
+@@ -1934,11 +1908,11 @@
+        $SUB_MAKEFILES \
+        Makefile,[
+ if test "x$cf_with_tests" != xno ; then
+-       CF_PRG_RULES([$srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LINK"], test)
++       CF_PRG_RULES([$srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD"], test)
  fi
  CF_LIB_RULES($SRC_SUBDIRS)
@@ -26192 +29792 @@
         $AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
  fi
-@@ -1954,6 +1924,7 @@
+@@ -1950,10 +1924,11 @@
+ AWK="$AWK"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
+ DFT_LWR_MODEL="$DFT_LWR_MODEL"
+-ECHO_LINK="$ECHO_LINK"
++ECHO_LD="$ECHO_LD"
  LDCONFIG="$LDCONFIG"
  LIBTOOL_VERSION="$LIBTOOL_VERSION"
@@ -26200 +29805 @@
  LIB_SUFFIX="$LIB_SUFFIX"
  LIB_TRACING="$LIB_TRACING"
-@@ -1985,12 +1956,14 @@
+@@ -1975,7 +1950,7 @@
+ TINFO_SUFFIX="$TINFO_SUFFIX"
+ USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
+ WITH_CURSES_H="$with_curses_h"
+-WITH_ECHO="$with_echo"
++WITH_ECHO="${enable_echo:=yes}"
+ WITH_OVERWRITE="$with_overwrite"
+ cf_LIST_MODELS="$cf_list_models"
+ cf_cv_abi_version="$cf_cv_abi_version"
+@@ -1985,12 +1960,14 @@
  cf_cv_enable_opaque="$cf_cv_enable_opaque"
  cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
@@ -26216 +29830 @@
  cf_with_manpages="$cf_with_manpages"
 diff -Naur ncurses-5.9.orig/dist.mk ncurses-5.9/dist.mk
---- ncurses-5.9.orig/dist.mk    2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/dist.mk 2012-02-16 18:25:13.287826611 +0000
+--- ncurses-5.9.orig/dist.mk    2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/dist.mk 2012-08-25 19:58:02.359886951 +0000
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -26230 +29844 @@
  ##############################################################################
 -# $Id: dist.mk,v 1.810 2011/04/04 22:42:20 tom Exp $
-+# $Id: dist.mk,v 1.857 2012/02/11 14:48:13 tom Exp $
++# $Id: dist.mk,v 1.886 2012/08/11 15:55:23 tom Exp $
  # Makefile for creating ncurses distributions.
  #
@@ -26239 +29853 @@
  NCURSES_MINOR = 9
 -NCURSES_PATCH = 20110404
-+NCURSES_PATCH = 20120211
++NCURSES_PATCH = 20120811
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 diff -Naur ncurses-5.9.orig/doc/html/man/adacurses-config.1.html ncurses-5.9/doc/html/man/adacurses-config.1.html
---- ncurses-5.9.orig/doc/html/man/adacurses-config.1.html       2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/adacurses-config.1.html    2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/adacurses-config.1.html       2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/adacurses-config.1.html    2012-08-25 19:58:00.273230151 +0000
 @@ -83,7 +83,7 @@
  <H2>SEE ALSO</H2><PRE>
@@ -26256 +29870 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/captoinfo.1m.html ncurses-5.9/doc/html/man/captoinfo.1m.html
---- ncurses-5.9.orig/doc/html/man/captoinfo.1m.html     2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/captoinfo.1m.html  2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/captoinfo.1m.html     2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/captoinfo.1m.html  2012-08-25 19:58:00.273230151 +0000
 @@ -208,7 +208,7 @@
  <H2>SEE ALSO</H2><PRE>
@@ -26268 +29882 @@
  </PRE>
 diff -Naur ncurses-5.9.orig/doc/html/man/clear.1.html ncurses-5.9/doc/html/man/clear.1.html
---- ncurses-5.9.orig/doc/html/man/clear.1.html  2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/clear.1.html       2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/clear.1.html  2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/clear.1.html       2012-08-25 19:58:00.273230151 +0000
 @@ -69,7 +69,7 @@
  <H2>SEE ALSO</H2><PRE>
@@ -26280 +29894 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/curs_termcap.3x.html ncurses-5.9/doc/html/man/curs_termcap.3x.html
---- ncurses-5.9.orig/doc/html/man/curs_termcap.3x.html  2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/curs_termcap.3x.html       2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/curs_termcap.3x.html  2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/curs_termcap.3x.html       2012-08-25 19:58:00.276563468 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -26456 +30070 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html ncurses-5.9/doc/html/man/curs_terminfo.3x.html
---- ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html 2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/curs_terminfo.3x.html      2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html 2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/curs_terminfo.3x.html      2012-08-25 19:58:00.276563468 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -26605 +30219 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/curs_util.3x.html ncurses-5.9/doc/html/man/curs_util.3x.html
---- ncurses-5.9.orig/doc/html/man/curs_util.3x.html     2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/curs_util.3x.html  2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/curs_util.3x.html     2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/curs_util.3x.html  2012-08-25 19:58:00.276563468 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -26626 +30240 @@
  <HEAD>
 diff -Naur ncurses-5.9.orig/doc/html/man/form.3x.html ncurses-5.9/doc/html/man/form.3x.html
---- ncurses-5.9.orig/doc/html/man/form.3x.html  2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/form.3x.html       2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/form.3x.html  2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/form.3x.html       2012-08-25 19:58:00.276563468 +0000
 @@ -243,7 +243,7 @@
  
@@ -26638 +30252 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/infocmp.1m.html ncurses-5.9/doc/html/man/infocmp.1m.html
---- ncurses-5.9.orig/doc/html/man/infocmp.1m.html       2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/infocmp.1m.html    2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/infocmp.1m.html       2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/infocmp.1m.html    2012-08-25 19:58:00.276563468 +0000
 @@ -2,7 +2,7 @@
  <!-- 
@@ -26785 +30399 @@
  </PRE>
 diff -Naur ncurses-5.9.orig/doc/html/man/infotocap.1m.html ncurses-5.9/doc/html/man/infotocap.1m.html
---- ncurses-5.9.orig/doc/html/man/infotocap.1m.html     2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/infotocap.1m.html  2012-02-16 18:25:13.127822391 +0000
+--- ncurses-5.9.orig/doc/html/man/infotocap.1m.html     2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/infotocap.1m.html  2012-08-25 19:58:00.276563468 +0000
 @@ -94,7 +94,7 @@
  <H2>SEE ALSO</H2><PRE>
@@ -26797 +30411 @@
  </PRE>
 diff -Naur ncurses-5.9.orig/doc/html/man/menu.3x.html ncurses-5.9/doc/html/man/menu.3x.html
---- ncurses-5.9.orig/doc/html/man/menu.3x.html  2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/menu.3x.html       2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/menu.3x.html  2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/menu.3x.html       2012-08-25 19:58:00.279896785 +0000
 @@ -226,7 +226,7 @@
  
@@ -26809 +30423 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/ncurses.3x.html ncurses-5.9/doc/html/man/ncurses.3x.html
---- ncurses-5.9.orig/doc/html/man/ncurses.3x.html       2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/ncurses.3x.html    2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/ncurses.3x.html       2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/ncurses.3x.html    2012-08-25 19:58:00.279896785 +0000
 @@ -28,7 +28,7 @@
    * sale, use or other dealings in this Software without prior written       *
@@ -27456 +31070 @@
         <STRONG>o</STRONG>   The routine <STRONG>has_key</STRONG> is not part of  XPG4,  nor  is  it
 diff -Naur ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html ncurses-5.9/doc/html/man/ncurses5-config.1.html
---- ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html        2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/ncurses5-config.1.html     2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html        2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/ncurses5-config.1.html     2012-08-25 19:58:00.279896785 +0000
 @@ -105,7 +105,8 @@
  
@@ -27478 +31092 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/panel.3x.html ncurses-5.9/doc/html/man/panel.3x.html
---- ncurses-5.9.orig/doc/html/man/panel.3x.html 2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/panel.3x.html      2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/panel.3x.html 2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/panel.3x.html      2012-08-25 19:58:00.283230103 +0000
 @@ -218,7 +218,7 @@
  <H2>SEE ALSO</H2><PRE>
@@ -27490 +31104 @@
  </PRE>
 diff -Naur ncurses-5.9.orig/doc/html/man/tabs.1.html ncurses-5.9/doc/html/man/tabs.1.html
---- ncurses-5.9.orig/doc/html/man/tabs.1.html   2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/tabs.1.html        2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/tabs.1.html   2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/tabs.1.html        2012-08-25 19:58:00.283230103 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -27520 +31134 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/term.7.html ncurses-5.9/doc/html/man/term.7.html
---- ncurses-5.9.orig/doc/html/man/term.7.html   2012-02-16 18:25:12.655809935 +0000
-+++ ncurses-5.9/doc/html/man/term.7.html        2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/term.7.html   2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/term.7.html        2012-08-25 19:58:00.283230103 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -27541 +31155 @@
  <HEAD>
 diff -Naur ncurses-5.9.orig/doc/html/man/term_variables.3x.html ncurses-5.9/doc/html/man/term_variables.3x.html
---- ncurses-5.9.orig/doc/html/man/term_variables.3x.html        2012-02-16 18:25:12.659810041 +0000
-+++ ncurses-5.9/doc/html/man/term_variables.3x.html     2012-02-16 18:25:13.131822496 +0000
+--- ncurses-5.9.orig/doc/html/man/term_variables.3x.html        2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/term_variables.3x.html     2012-08-25 19:58:00.283230103 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -27562 +31176 @@
  <HEAD>
 diff -Naur ncurses-5.9.orig/doc/html/man/terminfo.5.html ncurses-5.9/doc/html/man/terminfo.5.html
---- ncurses-5.9.orig/doc/html/man/terminfo.5.html       2012-02-16 18:25:12.655809935 +0000
-+++ ncurses-5.9/doc/html/man/terminfo.5.html    2012-02-16 18:25:13.135822601 +0000
+--- ncurses-5.9.orig/doc/html/man/terminfo.5.html       2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/terminfo.5.html    2012-08-25 19:58:00.286563421 +0000
 @@ -34,7 +34,7 @@
    ****************************************************************************
@@ -28626 +32240 @@
         upper left corner          ACS_ULCORNER   +          l
 diff -Naur ncurses-5.9.orig/doc/html/man/tic.1m.html ncurses-5.9/doc/html/man/tic.1m.html
---- ncurses-5.9.orig/doc/html/man/tic.1m.html   2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/tic.1m.html        2012-02-16 18:25:13.135822601 +0000
+--- ncurses-5.9.orig/doc/html/man/tic.1m.html   2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/tic.1m.html        2012-08-25 19:58:00.289896739 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -29058 +32672 @@
  </PRE>
 diff -Naur ncurses-5.9.orig/doc/html/man/toe.1m.html ncurses-5.9/doc/html/man/toe.1m.html
---- ncurses-5.9.orig/doc/html/man/toe.1m.html   2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/toe.1m.html        2012-02-16 18:25:13.135822601 +0000
+--- ncurses-5.9.orig/doc/html/man/toe.1m.html   2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/toe.1m.html        2012-08-25 19:58:00.289896739 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -29112 +32726 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/tput.1.html ncurses-5.9/doc/html/man/tput.1.html
---- ncurses-5.9.orig/doc/html/man/tput.1.html   2012-02-16 18:25:12.655809935 +0000
-+++ ncurses-5.9/doc/html/man/tput.1.html        2012-02-16 18:25:13.135822601 +0000
+--- ncurses-5.9.orig/doc/html/man/tput.1.html   2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/tput.1.html        2012-08-25 19:58:00.289896739 +0000
 @@ -2,7 +2,7 @@
  <!-- 
@@ -29167 +32781 @@
  
 diff -Naur ncurses-5.9.orig/doc/html/man/tset.1.html ncurses-5.9/doc/html/man/tset.1.html
---- ncurses-5.9.orig/doc/html/man/tset.1.html   2012-02-16 18:25:12.663810147 +0000
-+++ ncurses-5.9/doc/html/man/tset.1.html        2012-02-16 18:25:13.139822706 +0000
+--- ncurses-5.9.orig/doc/html/man/tset.1.html   2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/tset.1.html        2012-08-25 19:58:00.289896739 +0000
 @@ -1,7 +1,7 @@
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -29457 +33071 @@
  
  
+diff -Naur ncurses-5.9.orig/doc/html/ncurses-intro.html ncurses-5.9/doc/html/ncurses-intro.html
+--- ncurses-5.9.orig/doc/html/ncurses-intro.html        2012-08-25 19:57:59.366567772 +0000
++++ ncurses-5.9/doc/html/ncurses-intro.html     2012-08-25 19:58:01.293225327 +0000
+@@ -1,8 +1,8 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <!--
+-  $Id: ncurses-intro.html,v 1.44 2010/12/04 16:46:22 tom Exp $
++  $Id: ncurses-intro.html,v 1.45 2012/04/28 21:39:17 Paul.Waring Exp $
+   ****************************************************************************
+-  * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++  * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+   *                                                                          *
+   * Permission is hereby granted, free of charge, to any person obtaining a  *
+   * copy of this software and associated documentation files (the            *
+@@ -431,6 +431,7 @@
+ Here is a sample program to motivate the discussion:
+ 
+ <PRE>
++#include &lt;stdlib.h&gt;
+ #include &lt;curses.h&gt;
+ #include &lt;signal.h&gt;
+ 
+diff -Naur ncurses-5.9.orig/doc/ncurses-intro.doc ncurses-5.9/doc/ncurses-intro.doc
+--- ncurses-5.9.orig/doc/ncurses-intro.doc      2012-08-25 19:57:59.373234406 +0000
++++ ncurses-5.9/doc/ncurses-intro.doc   2012-08-25 19:58:01.296558645 +0000
+@@ -333,6 +333,7 @@
+ 
+    Here is a sample program to motivate the discussion:
+ #include <curses.h>
++#include <curses.h>
+ #include <signal.h>
+ 
+ static void finish(int sig);
 diff -Naur ncurses-5.9.orig/form/Makefile.in ncurses-5.9/form/Makefile.in
---- ncurses-5.9.orig/form/Makefile.in   2012-02-16 18:25:12.623809091 +0000
-+++ ncurses-5.9/form/Makefile.in        2012-02-16 18:25:12.947817639 +0000
+--- ncurses-5.9.orig/form/Makefile.in   2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/Makefile.in        2012-08-25 19:57:59.963231616 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.53 2010/11/27 21:45:27 tom Exp $
@@ -29477 +33124 @@
  
  NCURSES_MAJOR  = @NCURSES_MAJOR@
-diff -Naur ncurses-5.9.orig/form/fld_def.c ncurses-5.9/form/fld_def.c
---- ncurses-5.9.orig/form/fld_def.c     2012-02-16 18:25:12.623809091 +0000
-+++ ncurses-5.9/form/fld_def.c  2012-02-16 18:25:12.947817639 +0000
+diff -Naur ncurses-5.9.orig/form/fld_arg.c ncurses-5.9/form/fld_arg.c
+--- ncurses-5.9.orig/form/fld_arg.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_arg.c  2012-08-25 19:58:01.703223389 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
-- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29491 +33138 @@
  #include "form.priv.h"
  
+-MODULE_ID("$Id: fld_arg.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_arg.c,v 1.13 2012/06/10 00:27:49 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -71,7 +71,7 @@
+ 
+   if (typ != 0 && make_arg != (void *)0)
+     {
+-      typ->status |= _HAS_ARGS;
++      SetStatus(typ, _HAS_ARGS);
+       typ->makearg = make_arg;
+       typ->copyarg = copy_arg;
+       typ->freearg = free_arg;
+diff -Naur ncurses-5.9.orig/form/fld_def.c ncurses-5.9/form/fld_def.c
+--- ncurses-5.9.orig/form/fld_def.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_def.c  2012-08-25 19:58:00.973226841 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
 -MODULE_ID("$Id: fld_def.c,v 1.38 2010/01/23 21:14:35 tom Exp $")
-+MODULE_ID("$Id: fld_def.c,v 1.39 2011/07/16 22:26:11 tom Exp $")
++MODULE_ID("$Id: fld_def.c,v 1.40 2012/03/11 00:37:16 tom Exp $")
  
  /* this can't be readonly */
@@ -29523 +33198 @@
        else
         {
-diff -Naur ncurses-5.9.orig/form/frm_driver.c ncurses-5.9/form/frm_driver.c
---- ncurses-5.9.orig/form/frm_driver.c  2012-02-16 18:25:12.623809091 +0000
-+++ ncurses-5.9/form/frm_driver.c       2012-02-16 18:25:12.951817745 +0000
+@@ -293,14 +294,14 @@
+     {
+       T((T_CREATE("field %p"), (void *)New_Field));
+       *New_Field = default_field;
+-      New_Field->rows = rows;
+-      New_Field->cols = cols;
++      New_Field->rows = (short) rows;
++      New_Field->cols = (short) cols;
+       New_Field->drows = rows + nrow;
+       New_Field->dcols = cols;
+-      New_Field->frow = frow;
+-      New_Field->fcol = fcol;
++      New_Field->frow = (short) frow;
++      New_Field->fcol = (short) fcol;
+       New_Field->nrow = nrow;
+-      New_Field->nbuf = nbuf;
++      New_Field->nbuf = (short) nbuf;
+       New_Field->link = New_Field;
+ 
+ #if USE_WIDEC_SUPPORT
+diff -Naur ncurses-5.9.orig/form/fld_dup.c ncurses-5.9/form/fld_dup.c
+--- ncurses-5.9.orig/form/fld_dup.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_dup.c  2012-08-25 19:58:00.973226841 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29537 +33232 @@
  #include "form.priv.h"
  
+-MODULE_ID("$Id: fld_dup.c,v 1.13 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_dup.c,v 1.14 2012/03/11 00:37:16 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -60,8 +60,8 @@
+     {
+       T((T_CREATE("field %p"), (void *)New_Field));
+       *New_Field = *_nc_Default_Field;
+-      New_Field->frow = frow;
+-      New_Field->fcol = fcol;
++      New_Field->frow = (short) frow;
++      New_Field->fcol = (short) fcol;
+       New_Field->link = New_Field;
+       New_Field->rows = field->rows;
+       New_Field->cols = field->cols;
+diff -Naur ncurses-5.9.orig/form/fld_ftchoice.c ncurses-5.9/form/fld_ftchoice.c
+--- ncurses-5.9.orig/form/fld_ftchoice.c        2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/form/fld_ftchoice.c     2012-08-25 19:58:01.703223389 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_ftchoice.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_ftchoice.c,v 1.13 2012/06/10 00:27:49 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -56,7 +56,7 @@
+   if (!typ || !next_choice || !prev_choice)
+     RETURN(E_BAD_ARGUMENT);
+ 
+-  typ->status |= _HAS_CHOICE;
++  SetStatus(typ, _HAS_CHOICE);
+ #if NCURSES_INTEROP_FUNCS
+   typ->enum_next.onext = next_choice;
+   typ->enum_prev.oprev = prev_choice;
+diff -Naur ncurses-5.9.orig/form/fld_ftlink.c ncurses-5.9/form/fld_ftlink.c
+--- ncurses-5.9.orig/form/fld_ftlink.c  2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_ftlink.c       2012-08-25 19:58:01.703223389 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_ftlink.c,v 1.14 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_ftlink.c,v 1.15 2012/06/10 00:27:49 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -62,11 +62,11 @@
+        {
+          T((T_CREATE("fieldtype %p"), (void *)nftyp));
+          *nftyp = *_nc_Default_FieldType;
+-         nftyp->status |= _LINKED_TYPE;
++         SetStatus(nftyp, _LINKED_TYPE);
+          if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))
+-           nftyp->status |= _HAS_ARGS;
++           SetStatus(nftyp, _HAS_ARGS);
+          if ((type1->status & _HAS_CHOICE) || (type2->status & _HAS_CHOICE))
+-           nftyp->status |= _HAS_CHOICE;
++           SetStatus(nftyp, _HAS_CHOICE);
+          nftyp->left = type1;
+          nftyp->right = type2;
+          type1->ref++;
+diff -Naur ncurses-5.9.orig/form/fld_just.c ncurses-5.9/form/fld_just.c
+--- ncurses-5.9.orig/form/fld_just.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_just.c 2012-08-25 19:58:00.973226841 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_just.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_just.c,v 1.13 2012/03/11 00:37:16 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -59,7 +59,7 @@
+       Normalize_Field(field);
+       if (field->just != just)
+        {
+-         field->just = just;
++         field->just = (short) just;
+          res = _nc_Synchronize_Attributes(field);
+        }
+       else
+diff -Naur ncurses-5.9.orig/form/fld_link.c ncurses-5.9/form/fld_link.c
+--- ncurses-5.9.orig/form/fld_link.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_link.c 2012-08-25 19:58:00.976560158 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_link.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
++MODULE_ID("$Id: fld_link.c,v 1.13 2012/03/11 00:37:16 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -61,8 +61,8 @@
+     {
+       T((T_CREATE("field %p"), (void *)New_Field));
+       *New_Field = *_nc_Default_Field;
+-      New_Field->frow = frow;
+-      New_Field->fcol = fcol;
++      New_Field->frow = (short) frow;
++      New_Field->fcol = (short) fcol;
+ 
+       New_Field->link = field->link;
+       field->link = New_Field;
+diff -Naur ncurses-5.9.orig/form/fld_max.c ncurses-5.9/form/fld_max.c
+--- ncurses-5.9.orig/form/fld_max.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_max.c  2012-08-25 19:58:01.706556707 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_max.c,v 1.10 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fld_max.c,v 1.12 2012/06/10 00:21:24 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -62,13 +62,13 @@
+            RETURN(E_BAD_ARGUMENT);
+        }
+       field->maxgrow = maxgrow;
+-      field->status &= ~_MAY_GROW;
++      ClrStatus(field, _MAY_GROW);
+       if (!(field->opts & O_STATIC))
+        {
+          if ((maxgrow == 0) ||
+              (single_line_field && (field->dcols < maxgrow)) ||
+              (!single_line_field && (field->drows < maxgrow)))
+-           field->status |= _MAY_GROW;
++           SetStatus(field, _MAY_GROW);
+        }
+     }
+   RETURN(E_OK);
+diff -Naur ncurses-5.9.orig/form/fld_move.c ncurses-5.9/form/fld_move.c
+--- ncurses-5.9.orig/form/fld_move.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_move.c 2012-08-25 19:58:00.976560158 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_move.c,v 1.10 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fld_move.c,v 1.11 2012/03/11 00:37:16 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -56,8 +56,8 @@
+   if (field->form)
+     RETURN(E_CONNECTED);
+ 
+-  field->frow = frow;
+-  field->fcol = fcol;
++  field->frow = (short) frow;
++  field->fcol = (short) fcol;
+   RETURN(E_OK);
+ }
+ 
+diff -Naur ncurses-5.9.orig/form/fld_page.c ncurses-5.9/form/fld_page.c
+--- ncurses-5.9.orig/form/fld_page.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_page.c 2012-08-25 19:58:01.706556707 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_page.c,v 1.10 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fld_page.c,v 1.12 2012/06/10 00:12:47 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -54,9 +54,9 @@
+     RETURN(E_CONNECTED);
+ 
+   if (new_page_flag)
+-    field->status |= _NEWPAGE;
++    SetStatus(field, _NEWPAGE);
+   else
+-    field->status &= ~_NEWPAGE;
++    ClrStatus(field, _NEWPAGE);
+ 
+   RETURN(E_OK);
+ }
+diff -Naur ncurses-5.9.orig/form/fld_stat.c ncurses-5.9/form/fld_stat.c
+--- ncurses-5.9.orig/form/fld_stat.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fld_stat.c 2012-08-25 19:58:01.706556707 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_stat.c,v 1.12 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fld_stat.c,v 1.14 2012/06/10 00:13:09 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -51,9 +51,9 @@
+   Normalize_Field(field);
+ 
+   if (status)
+-    field->status |= _CHANGED;
++    SetStatus(field, _CHANGED);
+   else
+-    field->status &= ~_CHANGED;
++    ClrStatus(field, _CHANGED);
+ 
+   RETURN(E_OK);
+ }
+diff -Naur ncurses-5.9.orig/form/form.priv.h ncurses-5.9/form/form.priv.h
+--- ncurses-5.9.orig/form/form.priv.h   2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/form.priv.h        2012-08-25 19:58:00.976560158 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,11 +30,11 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: form.priv.h,v 0.32 2009/11/07 21:26:43 tom Exp $ */
++/* $Id: form.priv.h,v 0.33 2012/03/11 00:37:46 tom Exp $ */
+ 
+ #ifndef FORM_PRIV_H
+ #define FORM_PRIV_H 1
+-
++/* *INDENT-OFF*/
+ #include "curses.priv.h"
+ #include "mf_common.h"
+ 
+@@ -119,7 +119,7 @@
+ 
+ /* Calculate the total size of all buffers for this field */
+ #define Total_Buffer_Size(field) \
+-   ( (Buffer_Length(field) + 1) * (1+(field)->nbuf) * sizeof(FIELD_CELL) )
++   ( (size_t)(Buffer_Length(field) + 1) * (size_t)(1+(field)->nbuf) * sizeof(FIELD_CELL) )
+ 
+ /* Logic to determine whether or not a field is single lined */
+ #define Single_Line_Field(field) \
+@@ -293,5 +293,6 @@
+       result = ((*buffer || (l < width)) ? FALSE : TRUE); \
+     }
+ #endif
++/* *INDENT-ON*/
+ 
+ #endif /* FORM_PRIV_H */
+diff -Naur ncurses-5.9.orig/form/frm_def.c ncurses-5.9/form/frm_def.c
+--- ncurses-5.9.orig/form/frm_def.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/frm_def.c  2012-08-25 19:58:00.976560158 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_def.c,v 1.25 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: frm_def.c,v 1.26 2012/03/11 00:37:16 tom Exp $")
+ 
+ /* this can't be readonly */
+ static FORM default_form =
+@@ -199,14 +199,14 @@
+   for (j = 0; j < field_cnt; j++)
+     {
+       if (j == 0)
+-       pg->pmin = j;
++       pg->pmin = (short) j;
+       else
+        {
+          if (fields[j]->status & _NEWPAGE)
+            {
+-             pg->pmax = j - 1;
++             pg->pmax = (short) (j - 1);
+              pg++;
+-             pg->pmin = j;
++             pg->pmin = (short) j;
+            }
+        }
+ 
+@@ -214,14 +214,14 @@
+       maximum_col_in_field = fields[j]->fcol + fields[j]->cols;
+ 
+       if (form->rows < maximum_row_in_field)
+-       form->rows = maximum_row_in_field;
++       form->rows = (short) maximum_row_in_field;
+       if (form->cols < maximum_col_in_field)
+-       form->cols = maximum_col_in_field;
++       form->cols = (short) maximum_col_in_field;
+     }
+ 
+-  pg->pmax = field_cnt - 1;
+-  form->maxfield = field_cnt;
+-  form->maxpage = page_nr;
++  pg->pmax = (short) (field_cnt - 1);
++  form->maxfield = (short) field_cnt;
++  form->maxpage = (short) page_nr;
+ 
+   /* Sort fields on form pages */
+   for (page_nr = 0; page_nr < form->maxpage; page_nr++)
+@@ -230,8 +230,8 @@
+ 
+       for (j = form->page[page_nr].pmin; j <= form->page[page_nr].pmax; j++)
+        {
+-         fields[j]->index = j;
+-         fields[j]->page = page_nr;
++         fields[j]->index = (short) j;
++         fields[j]->page = (short) page_nr;
+          fld = Insert_Field_By_Position(fields[j], fld);
+        }
+       if (fld)
+diff -Naur ncurses-5.9.orig/form/frm_driver.c ncurses-5.9/form/frm_driver.c
+--- ncurses-5.9.orig/form/frm_driver.c  2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/frm_driver.c       2012-08-25 19:58:02.019888557 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
 -MODULE_ID("$Id: frm_driver.c,v 1.98 2010/05/01 21:11:43 tom Exp $")
-+MODULE_ID("$Id: frm_driver.c,v 1.99 2011/09/17 22:12:10 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.102 2012/07/21 23:23:08 tom Exp $")
  
  /*----------------------------------------------------------------------------
    This is the core module of the form library. It contains the majority
-@@ -1326,7 +1326,7 @@
+@@ -172,7 +172,7 @@
+    instead of a derived window because it contains invisible parts.
+    This is true for non-public fields and for scrollable fields. */
+ #define Has_Invisible_Parts(field)     \
+-  (!((field)->opts & O_PUBLIC)      || \
++  (!((unsigned)(field)->opts & O_PUBLIC) || \
+    Is_Scroll_Field(field))
+ 
+ /* Logic to decide whether or not a field needs justification */
+@@ -180,7 +180,7 @@
+    (((field)->just != NO_JUSTIFICATION)  && \
+     (Single_Line_Field(field))           && \
+     (((field)->dcols == (field)->cols)   && \
+-    ((field)->opts & O_STATIC))             )
++    ((unsigned)(field)->opts & O_STATIC)))
+ 
+ /* Logic to determine whether or not a dynamic field may still grow */
+ #define Growable(field) ((field)->status & _MAY_GROW)
+@@ -188,13 +188,13 @@
+ /* Macro to set the attributes for a fields window */
+ #define Set_Field_Window_Attributes(field,win) \
+ (  wbkgdset((win),(chtype)((field)->pad | (field)->back)), \
+-   (void) wattrset((win),(field)->fore) )
++   (void) wattrset((win), (int)(field)->fore) )
+ 
+ /* Logic to decide whether or not a field really appears on the form */
+ #define Field_Really_Appears(field)         \
+   ((field->form)                          &&\
+    (field->form->status & _POSTED)        &&\
+-   (field->opts & O_VISIBLE)              &&\
++   ((unsigned)field->opts & O_VISIBLE)    &&\
+    (field->page == field->form->curpage))
+ 
+ /* Logic to determine whether or not we are on the first position in the
+@@ -601,8 +601,8 @@
+ {
+   if (form->status & _WINDOW_MODIFIED)
+     {
+-      form->status &= ~_WINDOW_MODIFIED;
+-      form->status |= _FCHECK_REQUIRED;
++      ClrStatus(form, _WINDOW_MODIFIED);
++      SetStatus(form, _FCHECK_REQUIRED);
+       Window_To_Buffer(form, form->current);
+       wmove(form->w, form->currow, form->curcol);
+     }
+@@ -653,7 +653,7 @@
+            growth = Minimum(field->maxgrow - field->dcols, growth);
+          field->dcols += growth;
+          if (field->dcols == field->maxgrow)
+-           field->status &= ~_MAY_GROW;
++           ClrStatus(field, _MAY_GROW);
+        }
+       else
+        {
+@@ -662,7 +662,7 @@
+            growth = Minimum(field->maxgrow - field->drows, growth);
+          field->drows += growth;
+          if (field->drows == field->maxgrow)
+-           field->status &= ~_MAY_GROW;
++           ClrStatus(field, _MAY_GROW);
+        }
+       /* drows, dcols changed, so we get really the new buffer length */
+       new_buflen = Buffer_Length(field);
+@@ -674,7 +674,7 @@
+          field->drows = old_drows;
+          if ((single_line_field && (field->dcols != field->maxgrow)) ||
+              (!single_line_field && (field->drows != field->maxgrow)))
+-           field->status |= _MAY_GROW;
++           SetStatus(field, _MAY_GROW);
+        }
+       else
+        {
+@@ -753,7 +753,7 @@
+                   (field->dcols != field->maxgrow)) ||
+                  (!single_line_field &&
+                   (field->drows != field->maxgrow)))
+-               field->status |= _MAY_GROW;
++               SetStatus(field, _MAY_GROW);
+              free(newbuf);
+            }
+        }
+@@ -860,7 +860,7 @@
+   field = form->current;
+   formwin = Get_Form_Window(form);
+ 
+-  if (field->opts & O_PUBLIC)
++  if ((unsigned)field->opts & O_PUBLIC)
+     {
+       if (Is_Scroll_Field(field))
+        {
+@@ -897,19 +897,19 @@
+                  if (form->currow < form->toprow)
+                    {
+                      form->toprow = form->currow;
+-                     field->status |= _NEWTOP;
++                     SetStatus(field, _NEWTOP);
+                    }
+                  if (form->currow >= row_after_bottom)
+                    {
+                      form->toprow = form->currow - field->rows + 1;
+-                     field->status |= _NEWTOP;
++                     SetStatus(field, _NEWTOP);
+                    }
+                  if (field->status & _NEWTOP)
+                    {
+                      /* means we have to copy whole range */
+                      first_modified_row = form->toprow;
+                      first_unmodified_row = first_modified_row + field->rows;
+-                     field->status &= ~_NEWTOP;
++                     ClrStatus(field, _NEWTOP);
+                    }
+                  else
+                    {
+@@ -1111,27 +1111,27 @@
+     return E_SYSTEM_ERROR;
+   else
+     {
+-      if (field->opts & O_VISIBLE)
++      if ((unsigned)field->opts & O_VISIBLE)
+        {
+          Set_Field_Window_Attributes(field, win);
+        }
+       else
+        {
+-         (void)wattrset(win, WINDOW_ATTRS(fwin));
++         (void)wattrset(win, (int)WINDOW_ATTRS(fwin));
+        }
+       werase(win);
+     }
+ 
+   if (!bEraseFlag)
+     {
+-      if (field->opts & O_PUBLIC)
++      if ((unsigned)field->opts & O_PUBLIC)
+        {
+          if (Justification_Allowed(field))
+            Perform_Justification(field, win);
+          else
+            Buffer_To_Window(field, win);
+        }
+-      field->status &= ~_NEWTOP;
++      ClrStatus(field, _NEWTOP);
+     }
+   wsyncup(win);
+   delwin(win);
+@@ -1170,18 +1170,18 @@
+          form->currow = form->curcol = form->toprow = form->begincol = 0;
+          werase(form->w);
+ 
+-         if ((field->opts & O_PUBLIC) && Justification_Allowed(field))
++         if (((unsigned)field->opts & O_PUBLIC) && Justification_Allowed(field))
+            Undo_Justification(field, form->w);
+          else
+            Buffer_To_Window(field, form->w);
+ 
+-         field->status |= _NEWTOP;
++         SetStatus(field, _NEWTOP);
+          res = _nc_Refresh_Current_Field(form);
+        }
+       else
+        res = Display_Field(field);
+     }
+-  field->status |= _CHANGED;
++  SetStatus(field, _CHANGED);
+   return (res);
+ }
+ 
+@@ -1256,7 +1256,7 @@
+          werase(form->w);
+          wmove(form->w, form->currow, form->curcol);
+ 
+-         if (field->opts & O_PUBLIC)
++         if ((unsigned)field->opts & O_PUBLIC)
+            {
+              if (Justification_Allowed(field))
+                Undo_Justification(field, form->w);
+@@ -1272,7 +1272,7 @@
+                      field->rows - 1, field->cols - 1, 0);
+              wsyncup(formwin);
+              Buffer_To_Window(field, form->w);
+-             field->status |= _NEWTOP;         /* fake refresh to paint all */
++             SetStatus(field, _NEWTOP);        /* fake refresh to paint all */
+              _nc_Refresh_Current_Field(form);
+            }
+        }
+@@ -1326,34 +1326,34 @@
               field->opts = oldopts;
               returnCode(E_CURRENT);
@@ -29549 +33814 @@
 +         if (form->curpage == field->page)
             {
-              if (changed_opts & O_VISIBLE)
+-             if (changed_opts & O_VISIBLE)
++             if ((unsigned)changed_opts & O_VISIBLE)
                 {
+-                 if (newopts & O_VISIBLE)
++                 if ((unsigned)newopts & O_VISIBLE)
+                    res = Display_Field(field);
+                  else
+                    res = Erase_Field(field);
+                }
+              else
+                {
+-                 if ((changed_opts & O_PUBLIC) &&
+-                     (newopts & O_VISIBLE))
++                 if (((unsigned)changed_opts & O_PUBLIC) &&
++                     ((unsigned)newopts & O_VISIBLE))
+                    res = Display_Field(field);
+                }
+            }
+        }
+     }
+ 
+-  if (changed_opts & O_STATIC)
++  if ((unsigned)changed_opts & O_STATIC)
+     {
+       bool single_line_field = Single_Line_Field(field);
+       int res2 = E_OK;
+ 
+-      if (newopts & O_STATIC)
++      if ((unsigned)newopts & O_STATIC)
+        {
+          /* the field becomes now static */
+-         field->status &= ~_MAY_GROW;
++         ClrStatus(field, _MAY_GROW);
+          /* if actually we have no hidden columns, justification may
+             occur again */
+          if (single_line_field &&
+@@ -1371,7 +1371,7 @@
+              (single_line_field && (field->dcols < field->maxgrow)) ||
+              (!single_line_field && (field->drows < field->maxgrow)))
+            {
+-             field->status |= _MAY_GROW;
++             SetStatus(field, _MAY_GROW);
+              /* a field with justification now changes its behavior,
+                 so we must redisplay it */
+              if (single_line_field &&
+@@ -1424,18 +1424,18 @@
+       !(form->status & _POSTED))
+     {
+       if ((form->w) &&
+-         (field->opts & O_VISIBLE) &&
++         ((unsigned)field->opts & O_VISIBLE) &&
+          (field->form->curpage == field->page))
+        {
+          _nc_Refresh_Current_Field(form);
+-         if (field->opts & O_PUBLIC)
++         if ((unsigned)field->opts & O_PUBLIC)
+            {
+              if (field->drows > field->rows)
+                {
+                  if (form->toprow == 0)
+-                   field->status &= ~_NEWTOP;
++                   ClrStatus(field, _NEWTOP);
+                  else
+-                   field->status |= _NEWTOP;
++                   SetStatus(field, _NEWTOP);
+                }
+              else
+                {
+@@ -1469,7 +1469,7 @@
+        delwin(form->w);
+       form->w = new_window;
+ 
+-      form->status &= ~_WINDOW_MODIFIED;
++      ClrStatus(form, _WINDOW_MODIFIED);
+       Set_Field_Window_Attributes(field, form->w);
+ 
+       if (Has_Invisible_Parts(field))
+@@ -1998,7 +1998,7 @@
+     {
+       res = fct(form);
+       if (res == E_OK)
+-       form->current->status |= _NEWTOP;
++       SetStatus(form, _NEWTOP);
+     }
+   return (res);
+ }
+@@ -2430,7 +2430,7 @@
+   int result = E_REQUEST_DENIED;
+   bool Last_Row = ((field->drows - 1) == form->currow);
+ 
+-  if ((field->opts & O_WRAP) &&        /* wrapping wanted     */
++  if (((unsigned)field->opts & O_WRAP) &&      /* wrapping wanted     */
+       (!Single_Line_Field(field)) &&   /* must be multi-line  */
+       (There_Is_No_Room_For_A_Char_In_Line(form)) &&   /* line is full        */
+       (!Last_Row || Growable(field)))  /* there are more lines */
+@@ -2513,7 +2513,7 @@
+      editable fields.
+    */
+   if ((fct == FE_Delete_Previous) &&
+-      (form->opts & O_BS_OVERLOAD) &&
++      ((unsigned)form->opts & O_BS_OVERLOAD) &&
+       First_Position_In_Current_Field(form))
+     {
+       res = Inter_Field_Navigation(FN_Previous_Field, form);
+@@ -2522,7 +2522,7 @@
+     {
+       if (fct == FE_New_Line)
+        {
+-         if ((form->opts & O_NL_OVERLOAD) &&
++         if (((unsigned)form->opts & O_NL_OVERLOAD) &&
+              First_Position_In_Current_Field(form))
+            {
+              res = Inter_Field_Navigation(FN_Next_Field, form);
+@@ -2534,11 +2534,11 @@
+       else
+        {
+          /* From now on, everything must be editable */
+-         if (form->current->opts & O_EDIT)
++         if ((unsigned)form->current->opts & O_EDIT)
+            {
+              res = fct(form);
+              if (res == E_OK)
+-               form->status |= _WINDOW_MODIFIED;
++               SetStatus(form, _WINDOW_MODIFIED);
+            }
+        }
+     }
+@@ -2571,7 +2571,7 @@
+       if (Last_Row &&
+          (!(Growable(field) && !Single_Line_Field(field))))
+        {
+-         if (!(form->opts & O_NL_OVERLOAD))
++         if (!((unsigned)form->opts & O_NL_OVERLOAD))
+            returnCode(E_REQUEST_DENIED);
+          wmove(form->w, form->currow, form->curcol);
+          wclrtoeol(form->w);
+@@ -2579,7 +2579,7 @@
+             handled in the generic routine. The reason is,
+             that FN_Next_Field may fail, but the form is
+             definitively changed */
+-         form->status |= _WINDOW_MODIFIED;
++         SetStatus(form, _WINDOW_MODIFIED);
+          returnCode(Inter_Field_Navigation(FN_Next_Field, form));
+        }
+       else
+@@ -2595,7 +2595,7 @@
+          wclrtoeol(form->w);
+          form->currow++;
+          form->curcol = 0;
+-         form->status |= _WINDOW_MODIFIED;
++         SetStatus(form, _WINDOW_MODIFIED);
+          returnCode(E_OK);
+        }
+     }
+@@ -2605,7 +2605,7 @@
+       if (Last_Row &&
+          !(Growable(field) && !Single_Line_Field(field)))
+        {
+-         if (!(form->opts & O_NL_OVERLOAD))
++         if (!((unsigned)form->opts & O_NL_OVERLOAD))
+            returnCode(E_REQUEST_DENIED);
+          returnCode(Inter_Field_Navigation(FN_Next_Field, form));
+        }
+@@ -2627,7 +2627,7 @@
+          wmove(form->w, form->currow, form->curcol);
+          winsertln(form->w);
+          myADDNSTR(form->w, bp, (int)(t - bp));
+-         form->status |= _WINDOW_MODIFIED;
++         SetStatus(form, _WINDOW_MODIFIED);
+          returnCode(E_OK);
+        }
+     }
+@@ -2926,7 +2926,7 @@
+ EM_Overlay_Mode(FORM *form)
+ {
+   T((T_CALLED("EM_Overlay_Mode(%p)"), (void *)form));
+-  form->status |= _OVLMODE;
++  SetStatus(form, _OVLMODE);
+   returnCode(E_OK);
+ }
+ 
+@@ -2942,7 +2942,7 @@
+ EM_Insert_Mode(FORM *form)
+ {
+   T((T_CALLED("EM_Insert_Mode(%p)"), (void *)form));
+-  form->status &= ~_OVLMODE;
++  ClrStatus(form, _OVLMODE);
+   returnCode(E_OK);
+ }
+ 
+@@ -3111,7 +3111,7 @@
+ {
+   if (typ)
+     {
+-      if (field->opts & O_NULLOK)
++      if ((unsigned)field->opts & O_NULLOK)
+        {
+          FIELD_CELL *bp = field->buf;
+ 
+@@ -3168,12 +3168,12 @@
+ 
+   Synchronize_Buffer(form);
+   if ((form->status & _FCHECK_REQUIRED) ||
+-      (!(field->opts & O_PASSOK)))
++      (!((unsigned)field->opts & O_PASSOK)))
+     {
+       if (!Check_Field(form, field->type, field, (TypeArgument *)(field->arg)))
+        return FALSE;
+-      form->status &= ~_FCHECK_REQUIRED;
+-      field->status |= _CHANGED;
++      ClrStatus(form, _FCHECK_REQUIRED);
++      SetStatus(field, _CHANGED);
+       Synchronize_Linked_Fields(field);
+     }
+   return TRUE;
+@@ -3273,14 +3273,15 @@
+          do
+            {
+              field = (field == last_on_page) ? first : field + 1;
+-             if (((*field)->opts & O_VISIBLE))
++             if (((unsigned)(*field)->opts & O_VISIBLE))
+                break;
+            }
+          while (proposed != (*field));
+ 
+          proposed = *field;
+ 
+-         if ((proposed == *last_on_page) && !(proposed->opts & O_VISIBLE))
++         if ((proposed == *last_on_page) &&
++             !((unsigned)proposed->opts & O_VISIBLE))
+            {
+              /* This means, there is also no visible field on the page.
+                 So we propose the first one and hope the very best...
+@@ -3816,11 +3817,11 @@
+       FIELD *last_field, *field_on_page;
+ 
+       werase(Get_Form_Window(form));
+-      form->curpage = page;
++      form->curpage = (short)page;
+       last_field = field_on_page = form->field[form->page[page].smin];
+       do
+        {
+-         if (field_on_page->opts & O_VISIBLE)
++         if ((unsigned)field_on_page->opts & O_VISIBLE)
+            if ((res = Display_Field(field_on_page)) != E_OK)
+              return (res);
+          field_on_page = field_on_page->snext;
+@@ -3999,13 +4000,13 @@
+   int result = E_REQUEST_DENIED;
+ 
+   T((T_CALLED("Data_Entry(%p,%s)"), (void *)form, _tracechtype((chtype)c)));
+-  if ((field->opts & O_EDIT)
++  if (((unsigned)field->opts & O_EDIT)
+ #if FIX_FORM_INACTIVE_BUG
+-      && (field->opts & O_ACTIVE)
++      && ((unsigned)field->opts & O_ACTIVE)
+ #endif
+     )
+     {
+-      if ((field->opts & O_BLANK) &&
++      if (((unsigned)field->opts & O_BLANK) &&
+          First_Position_In_Current_Field(form) &&
+          !(form->status & _FCHECK_REQUIRED) &&
+          !(form->status & _WINDOW_MODIFIED))
+@@ -4035,8 +4036,8 @@
+          bool End_Of_Field = (((field->drows - 1) == form->currow) &&
+                               ((field->dcols - 1) == form->curcol));
+ 
+-         form->status |= _WINDOW_MODIFIED;
+-         if (End_Of_Field && !Growable(field) && (field->opts & O_AUTOSKIP))
++         SetStatus(form, _WINDOW_MODIFIED);
++         if (End_Of_Field && !Growable(field) && ((unsigned)field->opts & O_AUTOSKIP))
+            result = Inter_Field_Navigation(FN_Next_Field, form);
+          else
+            {
+@@ -4228,7 +4229,10 @@
+ 
+   if ((c >= MIN_FORM_COMMAND && c <= MAX_FORM_COMMAND) &&
+       ((bindings[c - MIN_FORM_COMMAND].keycode & Key_Mask) == c))
+-    BI = &(bindings[c - MIN_FORM_COMMAND]);
++    {
++      TR(TRACE_CALLS, ("form_request %s", form_request_name(c)));
++      BI = &(bindings[c - MIN_FORM_COMMAND]);
++    }
+ 
+   if (BI)
+     {
+@@ -4246,7 +4250,7 @@
+        NULL                    /* Choice Request is generic           */
+       };
+       size_t nMethods = (sizeof(Generic_Methods) / sizeof(Generic_Methods[0]));
+-      size_t method = (BI->keycode >> ID_Shft) & 0xffff;       /* see ID_Mask */
++      size_t method = (size_t) ((BI->keycode >> ID_Shft) & 0xffff);    /* see ID_Mask */
+ 
+       if ((method >= nMethods) || !(BI->cmd))
+        res = E_SYSTEM_ERROR;
+@@ -4255,9 +4259,13 @@
+          Generic_Method fct = Generic_Methods[method];
+ 
+          if (fct)
+-           res = fct(BI->cmd, form);
++           {
++             res = fct(BI->cmd, form);
++           }
+          else
+-           res = (BI->cmd) (form);
++           {
++             res = (BI->cmd) (form);
++           }
+        }
+     }
+ #ifdef NCURSES_MOUSE_VERSION
+@@ -4401,14 +4409,14 @@
+   if (!field || !value || ((buffer < 0) || (buffer > field->nbuf)))
+     RETURN(E_BAD_ARGUMENT);
+ 
+-  len = Buffer_Length(field);
++  len = (unsigned)Buffer_Length(field);
+ 
+   if (Growable(field))
+     {
+       /* for a growable field we must assume zero terminated strings, because
+          somehow we have to detect the length of what should be copied.
+        */
+-      unsigned int vlen = strlen(value);
++      unsigned vlen = (unsigned)strlen(value);
+ 
+       if (vlen > len)
+        {
+@@ -4438,7 +4446,7 @@
+       delwin(field->working);
+       field->working = newpad(1, Buffer_Length(field) + 1);
+     }
+-  len = Buffer_Length(field);
++  len = (unsigned)Buffer_Length(field);
+   wclear(field->working);
+   (void)mvwaddstr(field->working, 0, 0, value);
+ 
+@@ -4450,8 +4458,8 @@
+     {
+       for (i = 0; i < (unsigned)field->drows; ++i)
+        {
+-         (void)mvwin_wchnstr(field->working, 0, i * field->dcols,
+-                             widevalue + (i * field->dcols),
++         (void)mvwin_wchnstr(field->working, 0, (int)i * field->dcols,
++                             widevalue + ((int)i * field->dcols),
+                              field->dcols);
+        }
+       for (i = 0; i < len; ++i)
+@@ -4512,7 +4520,7 @@
+     {
+ #if USE_WIDEC_SUPPORT
+       FIELD_CELL *data = Address_Of_Nth_Buffer(field, buffer);
+-      unsigned need = 0;
++      size_t need = 0;
+       int size = Buffer_Length(field);
+       int n;
+ 
+@@ -4613,7 +4621,7 @@
+                {
+                  result[need] = wch;
+                }
+-             passed += status;
++             passed += (size_t) status;
+              ++need;
+            }
+          else
+@@ -4633,7 +4641,7 @@
+            break;
+          result = typeCalloc(wchar_t, need);
+ 
+-         *lengthp = need;
++         *lengthp = (int)need;
+          if (result == 0)
+            break;
+        }
+diff -Naur ncurses-5.9.orig/form/frm_hook.c ncurses-5.9/form/frm_hook.c
+--- ncurses-5.9.orig/form/frm_hook.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/frm_hook.c 2012-08-25 19:58:00.979893475 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,13 +32,13 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_hook.c,v 1.15 2010/01/23 21:12:08 tom Exp $")
++MODULE_ID("$Id: frm_hook.c,v 1.16 2012/03/11 00:37:16 tom Exp $")
+ 
+ /* "Template" macro to generate function to set application specific hook */
+ #define GEN_HOOK_SET_FUNCTION( typ, name ) \
+ NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\
+ {\
+-   T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), form, func));\
++   T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, func));\
+    (Normalize_Form( form ) -> typ ## name) = func ;\
+    RETURN(E_OK);\
+ }
+diff -Naur ncurses-5.9.orig/form/frm_opts.c ncurses-5.9/form/frm_opts.c
+--- ncurses-5.9.orig/form/frm_opts.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/frm_opts.c 2012-08-25 19:58:01.713223341 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_opts.c,v 1.15 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: frm_opts.c,v 1.16 2012/06/09 20:29:33 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -49,7 +49,7 @@
+ {
+   T((T_CALLED("set_form_opts(%p,%d)"), (void *)form, opts));
+ 
+-  opts &= ALL_FORM_OPTS;
++  opts &= (Form_Options) ALL_FORM_OPTS;
+   if (opts & ~ALL_FORM_OPTS)
+     RETURN(E_BAD_ARGUMENT);
+   else
+@@ -89,7 +89,7 @@
+ {
+   T((T_CALLED("form_opts_on(%p,%d)"), (void *)form, opts));
+ 
+-  opts &= ALL_FORM_OPTS;
++  opts &= (Form_Options) ALL_FORM_OPTS;
+   if (opts & ~ALL_FORM_OPTS)
+     RETURN(E_BAD_ARGUMENT);
+   else
+@@ -114,7 +114,7 @@
+ {
+   T((T_CALLED("form_opts_off(%p,%d)"), (void *)form, opts));
+ 
+-  opts &= ALL_FORM_OPTS;
++  opts &= (Form_Options) ALL_FORM_OPTS;
+   if (opts & ~ALL_FORM_OPTS)
+     RETURN(E_BAD_ARGUMENT);
+   else
+diff -Naur ncurses-5.9.orig/form/frm_page.c ncurses-5.9/form/frm_page.c
+--- ncurses-5.9.orig/form/frm_page.c    2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/form/frm_page.c 2012-08-25 19:58:01.716556658 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_page.c,v 1.11 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: frm_page.c,v 1.12 2012/06/10 00:28:04 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -58,7 +58,7 @@
+ 
+   if (!(form->status & _POSTED))
+     {
+-      form->curpage = page;
++      form->curpage = (short)page;
+       form->current = _nc_First_Active_Field(form);
+     }
+   else
+diff -Naur ncurses-5.9.orig/form/frm_post.c ncurses-5.9/form/frm_post.c
+--- ncurses-5.9.orig/form/frm_post.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/frm_post.c 2012-08-25 19:58:01.716556658 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_post.c,v 1.10 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: frm_post.c,v 1.11 2012/06/10 00:27:49 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform  
+@@ -77,7 +77,7 @@
+   if ((err = _nc_Set_Form_Page(form, page, form->current)) != E_OK)
+     RETURN(err);
+ 
+-  form->status |= _POSTED;
++  SetStatus(form, _POSTED);
+ 
+   Call_Hook(form, forminit);
+   Call_Hook(form, fieldinit);
+@@ -117,7 +117,7 @@
+   werase(Get_Form_Window(form));
+   delwin(form->w);
+   form->w = (WINDOW *)0;
+-  form->status &= ~_POSTED;
++  ClrStatus(form, _POSTED);
+   RETURN(E_OK);
+ }
+ 
+diff -Naur ncurses-5.9.orig/form/frm_req_name.c ncurses-5.9/form/frm_req_name.c
+--- ncurses-5.9.orig/form/frm_req_name.c        2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/form/frm_req_name.c     2012-08-25 19:58:02.023221875 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_req_name.c,v 1.17 2009/10/10 16:17:01 tom Exp $")
++MODULE_ID("$Id: frm_req_name.c,v 1.18 2012/07/21 23:17:23 tom Exp $")
+ 
+ static const char *request_names[MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1] =
+ {
+@@ -144,23 +144,26 @@
+   /* because the table is so small, it doesn't really hurt
+      to run sequentially through it.
+    */
+-  unsigned int i = 0;
+-  char buf[16];
++  size_t i = 0;
++  char buf[16];                        /* longest name is 10 chars */
+ 
+   T((T_CALLED("form_request_by_name(%s)"), _nc_visbuf(str)));
+ 
+-  if (str)
++  if (str != 0 && (i = strlen(str)) != 0)
+     {
+-      strncpy(buf, str, sizeof(buf));
+-      while ((i < sizeof(buf)) && (buf[i] != '\0'))
++      if (i > sizeof(buf) - 2)
++       i = sizeof(buf) - 2;
++      memcpy(buf, str, i);
++      buf[i] = '\0';
++
++      for (i = 0; buf[i] != '\0'; ++i)
+        {
+          buf[i] = (char)toupper(UChar(buf[i]));
+-         i++;
+        }
+ 
+       for (i = 0; i < A_SIZE; i++)
+        {
+-         if (strncmp(request_names[i], buf, sizeof(buf)) == 0)
++         if (strcmp(request_names[i], buf) == 0)
+            returnCode(MIN_FORM_COMMAND + (int)i);
+        }
+     }
+diff -Naur ncurses-5.9.orig/form/fty_generic.c ncurses-5.9/form/fty_generic.c
+--- ncurses-5.9.orig/form/fty_generic.c 2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fty_generic.c      2012-08-25 19:58:01.716556658 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,7 +34,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_generic.c,v 1.5 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fty_generic.c,v 1.6 2012/06/10 00:27:49 tom Exp $")
+ 
+ /*
+  * This is not a full implementation of a field type, but adds some
+@@ -119,7 +119,7 @@
+       if (res)
+        {
+          *res = *_nc_Default_FieldType;
+-         res->status |= (_HAS_ARGS | _GENERIC);
++         SetStatus(res, (_HAS_ARGS | _GENERIC));
+          res->fieldcheck.gfcheck = field_check;
+          res->charcheck.gccheck = char_check;
+          res->genericarg = Generic_This_Type;
+diff -Naur ncurses-5.9.orig/form/fty_int.c ncurses-5.9/form/fty_int.c
+--- ncurses-5.9.orig/form/fty_int.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/form/fty_int.c  2012-08-25 19:58:00.906560490 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,7 +34,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_int.c,v 1.25 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fty_int.c,v 1.26 2012/02/23 10:02:15 tom Exp $")
+ 
+ #if USE_WIDEC_SUPPORT
+ #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
+@@ -233,7 +233,8 @@
+            }
+          if (result)
+            {
+-             sprintf(buf, "%.*ld", (prec > 0 ? prec : 0), val);
++             _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                         "%.*ld", (prec > 0 ? prec : 0), val);
+              set_field_buffer(field, 0, buf);
+            }
+        }
+diff -Naur ncurses-5.9.orig/form/fty_num.c ncurses-5.9/form/fty_num.c
+--- ncurses-5.9.orig/form/fty_num.c     2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/form/fty_num.c  2012-08-25 19:58:00.906560490 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,7 +34,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_num.c,v 1.28 2010/01/23 21:14:36 tom Exp $")
++MODULE_ID("$Id: fty_num.c,v 1.29 2012/02/23 10:02:15 tom Exp $")
+ 
+ #if HAVE_LOCALE_H
+ #include <locale.h>
+@@ -271,7 +271,8 @@
+            }
+          if (result)
+            {
+-             sprintf(buf, "%.*f", (prec > 0 ? prec : 0), val);
++             _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                         "%.*f", (prec > 0 ? prec : 0), val);
+              set_field_buffer(field, 0, buf);
+            }
+        }
 diff -Naur ncurses-5.9.orig/include/Caps ncurses-5.9/include/Caps
---- ncurses-5.9.orig/include/Caps       2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/Caps    2012-02-16 18:25:12.951817745 +0000
+--- ncurses-5.9.orig/include/Caps       2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/Caps    2012-08-25 19:57:59.973231570 +0000
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -29599 +34514 @@
  #
 diff -Naur ncurses-5.9.orig/include/Caps.aix4 ncurses-5.9/include/Caps.aix4
---- ncurses-5.9.orig/include/Caps.aix4  2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/Caps.aix4       2012-02-16 18:25:12.951817745 +0000
+--- ncurses-5.9.orig/include/Caps.aix4  2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/Caps.aix4       2012-08-25 19:57:59.973231570 +0000
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -29646 +34561 @@
  #
 diff -Naur ncurses-5.9.orig/include/Caps.hpux11 ncurses-5.9/include/Caps.hpux11
---- ncurses-5.9.orig/include/Caps.hpux11        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/Caps.hpux11     2012-02-16 18:25:12.951817745 +0000
+--- ncurses-5.9.orig/include/Caps.hpux11        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/Caps.hpux11     2012-08-25 19:57:59.976564888 +0000
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -29693 +34608 @@
  enter_low_hl_mode              elohlm  str     Xo      -               -       -----   Enter low highlight mode
 diff -Naur ncurses-5.9.orig/include/Caps.keys ncurses-5.9/include/Caps.keys
---- ncurses-5.9.orig/include/Caps.keys  2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/Caps.keys       2012-02-16 18:25:12.951817745 +0000
+--- ncurses-5.9.orig/include/Caps.keys  2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/Caps.keys       2012-08-25 19:57:59.979898205 +0000
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -29740 +34655 @@
  #
 diff -Naur ncurses-5.9.orig/include/Caps.osf1r5 ncurses-5.9/include/Caps.osf1r5
---- ncurses-5.9.orig/include/Caps.osf1r5        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/Caps.osf1r5     2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/Caps.osf1r5        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/Caps.osf1r5     2012-08-25 19:57:59.983231522 +0000
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -29768 +34683 @@
  enter_low_hl_mode              elohlm  str     Xo      -               -       -----   Enter low highlight mode
 diff -Naur ncurses-5.9.orig/include/MKterm.h.awk.in ncurses-5.9/include/MKterm.h.awk.in
---- ncurses-5.9.orig/include/MKterm.h.awk.in    2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/MKterm.h.awk.in 2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/MKterm.h.awk.in    2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/MKterm.h.awk.in 2012-08-25 19:57:59.983231522 +0000
 @@ -1,7 +1,7 @@
  # vile:awkmode
@@ -29831 +34746 @@
                     print  "#if __MINGW32__"
 diff -Naur ncurses-5.9.orig/include/curses.h.in ncurses-5.9/include/curses.h.in
---- ncurses-5.9.orig/include/curses.h.in        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/curses.h.in     2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/curses.h.in        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/curses.h.in     2012-08-25 19:58:02.046555098 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -32,7 +32,7 @@
   *     and: Thomas E. Dickey                        1996-on                 *
@@ -29838 +34760 @@
  
 -/* $Id: curses.h.in,v 1.220 2011/01/22 19:47:20 tom Exp $ */
-+/* $Id: curses.h.in,v 1.227 2011/10/29 20:01:35 tom Exp $ */
++/* $Id: curses.h.in,v 1.232 2012/07/28 18:17:43 tom Exp $ */
  
  #ifndef __NCURSES_H
  #define __NCURSES_H
-@@ -151,15 +151,21 @@
+@@ -129,6 +129,13 @@
+ #define NCURSES_TPARM_VARARGS @NCURSES_TPARM_VARARGS@
+ 
+ /*
++ * Control type used for tparm's arguments.  While X/Open equates long and
++ * char* values, this is not always workable for 64-bit platforms.
++ */
++#undef NCURSES_TPARM_ARG
++#define NCURSES_TPARM_ARG @NCURSES_TPARM_ARG@
++
++/*
+  * NCURSES_CH_T is used in building the library, but not used otherwise in
+  * this header file, since that would make the normal/wide-character versions
+  * of the header incompatible.
+@@ -151,15 +158,21 @@
  
  /*
@@ -29869 +34805 @@
  #endif
  
-@@ -342,7 +348,7 @@
+@@ -250,7 +263,7 @@
+ extern NCURSES_EXPORT_VAR(chtype) acs_map[];
+ #endif
+ 
+-#define NCURSES_ACS(c) (acs_map[NCURSES_CAST(unsigned char,c)])
++#define NCURSES_ACS(c) (acs_map[NCURSES_CAST(unsigned char,(c))])
+ 
+ /* VT100 symbols begin here */
+ #define ACS_ULCORNER   NCURSES_ACS('l') /* upper left corner */
+@@ -342,7 +355,7 @@
  
  typedef        chtype  attr_t;         /* ...must be at least as wide as chtype */
@@ -29878 +34823 @@
  #if @NCURSES_LIBUTF8@
  #ifdef mblen                   /* libutf8.h defines it w/o undefining first */
-@@ -366,7 +372,7 @@
+@@ -366,7 +379,7 @@
  /*
   * cchar_t stores an array of CCHARW_MAX wide characters.  The first is
@@ -29887 +34832 @@
   */
  #define CCHARW_MAX     @NCURSES_CCHARW_MAX@
-@@ -434,7 +440,7 @@
+@@ -434,7 +447,7 @@
  
         NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
@@ -29896 +34841 @@
  #if @NCURSES_EXT_COLORS@
         int     _color;         /* current color-pair for non-space character */
-@@ -854,7 +860,7 @@
+@@ -757,6 +770,7 @@
+ extern NCURSES_EXPORT(int) ungetch (int);                              /* implemented */
+ extern NCURSES_EXPORT(int) untouchwin (WINDOW *);                      /* generated */
+ extern NCURSES_EXPORT(void) use_env (bool);                            /* implemented */
++extern NCURSES_EXPORT(void) use_tioctl (bool);                         /* implemented */
+ extern NCURSES_EXPORT(int) vidattr (chtype);                           /* implemented */
+ extern NCURSES_EXPORT(int) vidputs (chtype, NCURSES_OUTC);             /* implemented */
+ extern NCURSES_EXPORT(int) vline (chtype, int);                                /* generated */
+@@ -832,7 +846,7 @@
+ #if NCURSES_TPARM_VARARGS
+ extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);       /* special */
+ #else
+-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);      /* special */
++extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG); /* special */
+ extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);       /* special */
+ #endif
+ 
+@@ -854,7 +868,7 @@
  /*
   * vid_attr() was implemented originally based on a draft of X/Open curses.
@@ -29905 +34867 @@
  #endif
  
-@@ -1115,7 +1121,7 @@
+@@ -994,6 +1008,7 @@
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented:SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented:SP_FUNC */
+ extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented:SP_FUNC */
++extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_tioctl) (SCREEN*, bool); /* implemented:SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype); /* implemented:SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */
+ #if @NCURSES_EXT_FUNCS@
+@@ -1084,7 +1099,7 @@
+  */
+ 
+ #define wgetstr(w, s)          wgetnstr(w, s, -1)
+-#define getnstr(s, n)          wgetnstr(stdscr, s, n)
++#define getnstr(s, n)          wgetnstr(stdscr, s, (n))
+ 
+ #define setterm(term)          setupterm(term, 1, (int *)0)
+ 
+@@ -1115,7 +1130,7 @@
  #define wattroff(win,at)       wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
  
@@ -29914 +34893 @@
                                   ? ((win)->_color = PAIR_NUMBER(at), \
                                       (win)->_attrs = NCURSES_CAST(attr_t, at), \
-@@ -1145,7 +1151,7 @@
+@@ -1137,15 +1152,15 @@
+ 
+ #define box(win, v, h)         wborder(win, v, v, h, h, 0, 0, 0, 0)
+ #define border(ls, rs, ts, bs, tl, tr, bl, br) wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br)
+-#define hline(ch, n)           whline(stdscr, ch, n)
+-#define vline(ch, n)           wvline(stdscr, ch, n)
++#define hline(ch, n)           whline(stdscr, ch, (n))
++#define vline(ch, n)           wvline(stdscr, ch, (n))
+ 
+ #define winstr(w, s)           winnstr(w, s, -1)
+ #define winchstr(w, s)         winchnstr(w, s, -1)
  #define winsstr(w, s)          winsnstr(w, s, -1)
  
@@ -29923 +34912 @@
  
  #define waddstr(win,str)       waddnstr(win,str,-1)
-@@ -1256,24 +1262,29 @@
+@@ -1154,55 +1169,55 @@
+ /*
+  * These apply to the first 256 color pairs.
+  */
+-#define COLOR_PAIR(n)  NCURSES_BITS(n, 0)
+-#define PAIR_NUMBER(a) (NCURSES_CAST(int,((NCURSES_CAST(unsigned long,a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
++#define COLOR_PAIR(n)  NCURSES_BITS((n), 0)
++#define PAIR_NUMBER(a) (NCURSES_CAST(int,((NCURSES_CAST(unsigned long,(a)) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
+ 
+ /*
+  * pseudo functions for standard screen
+  */
+ 
+-#define addch(ch)              waddch(stdscr,ch)
+-#define addchnstr(str,n)       waddchnstr(stdscr,str,n)
+-#define addchstr(str)          waddchstr(stdscr,str)
+-#define addnstr(str,n)         waddnstr(stdscr,str,n)
+-#define addstr(str)            waddnstr(stdscr,str,-1)
+-#define attroff(at)            wattroff(stdscr,at)
+-#define attron(at)             wattron(stdscr,at)
+-#define attrset(at)            wattrset(stdscr,at)
+-#define attr_get(ap,cp,o)      wattr_get(stdscr,ap,cp,o)
+-#define attr_off(a,o)          wattr_off(stdscr,a,o)
+-#define attr_on(a,o)           wattr_on(stdscr,a,o)
+-#define attr_set(a,c,o)                wattr_set(stdscr,a,c,o)
+-#define bkgd(ch)               wbkgd(stdscr,ch)
+-#define bkgdset(ch)            wbkgdset(stdscr,ch)
+-#define chgat(n,a,c,o)         wchgat(stdscr,n,a,c,o)
++#define addch(ch)              waddch(stdscr,(ch))
++#define addchnstr(str,n)       waddchnstr(stdscr,(str),(n))
++#define addchstr(str)          waddchstr(stdscr,(str))
++#define addnstr(str,n)         waddnstr(stdscr,(str),(n))
++#define addstr(str)            waddnstr(stdscr,(str),-1)
++#define attroff(at)            wattroff(stdscr,(at))
++#define attron(at)             wattron(stdscr,(at))
++#define attrset(at)            wattrset(stdscr,(at))
++#define attr_get(ap,cp,o)      wattr_get(stdscr,(ap),(cp),(o))
++#define attr_off(a,o)          wattr_off(stdscr,(a),(o))
++#define attr_on(a,o)           wattr_on(stdscr,(a),(o))
++#define attr_set(a,c,o)                wattr_set(stdscr,(a),(c),(o))
++#define bkgd(ch)               wbkgd(stdscr,(ch))
++#define bkgdset(ch)            wbkgdset(stdscr,(ch))
++#define chgat(n,a,c,o)         wchgat(stdscr,(n),(a),(c),(o))
+ #define clear()                        wclear(stdscr)
+ #define clrtobot()             wclrtobot(stdscr)
+ #define clrtoeol()             wclrtoeol(stdscr)
+-#define color_set(c,o)         wcolor_set(stdscr,c,o)
++#define color_set(c,o)         wcolor_set(stdscr,(c),(o))
+ #define delch()                        wdelch(stdscr)
+ #define deleteln()             winsdelln(stdscr,-1)
+-#define echochar(c)            wechochar(stdscr,c)
++#define echochar(c)            wechochar(stdscr,(c))
+ #define erase()                        werase(stdscr)
+ #define getch()                        wgetch(stdscr)
+-#define getstr(str)            wgetstr(stdscr,str)
++#define getstr(str)            wgetstr(stdscr,(str))
+ #define inch()                 winch(stdscr)
+-#define inchnstr(s,n)          winchnstr(stdscr,s,n)
+-#define inchstr(s)             winchstr(stdscr,s)
+-#define innstr(s,n)            winnstr(stdscr,s,n)
+-#define insch(c)               winsch(stdscr,c)
+-#define insdelln(n)            winsdelln(stdscr,n)
++#define inchnstr(s,n)          winchnstr(stdscr,(s),(n))
++#define inchstr(s)             winchstr(stdscr,(s))
++#define innstr(s,n)            winnstr(stdscr,(s),(n))
++#define insch(c)               winsch(stdscr,(c))
++#define insdelln(n)            winsdelln(stdscr,(n))
+ #define insertln()             winsdelln(stdscr,1)
+-#define insnstr(s,n)           winsnstr(stdscr,s,n)
+-#define insstr(s)              winsstr(stdscr,s)
+-#define instr(s)               winstr(stdscr,s)
+-#define move(y,x)              wmove(stdscr,y,x)
++#define insnstr(s,n)           winsnstr(stdscr,(s),(n))
++#define insstr(s)              winsstr(stdscr,(s))
++#define instr(s)               winstr(stdscr,(s))
++#define move(y,x)              wmove(stdscr,(y),(x))
+ #define refresh()              wrefresh(stdscr)
+-#define scrl(n)                        wscrl(stdscr,n)
+-#define setscrreg(t,b)         wsetscrreg(stdscr,t,b)
++#define scrl(n)                        wscrl(stdscr,(n))
++#define setscrreg(t,b)         wsetscrreg(stdscr,(t),(b))
+ #define standend()             wstandend(stdscr)
+ #define standout()             wstandout(stdscr)
+-#define timeout(delay)         wtimeout(stdscr,delay)
++#define timeout(delay)         wtimeout(stdscr,(delay))
+ #define wdeleteln(win)         winsdelln(win,-1)
+ #define winsertln(win)         winsdelln(win,1)
+ 
+@@ -1210,70 +1225,75 @@
+  * mv functions
+  */
+ 
+-#define mvwaddch(win,y,x,ch)           (wmove(win,y,x) == ERR ? ERR : waddch(win,ch))
+-#define mvwaddchnstr(win,y,x,str,n)    (wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,n))
+-#define mvwaddchstr(win,y,x,str)       (wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,-1))
+-#define mvwaddnstr(win,y,x,str,n)      (wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,n))
+-#define mvwaddstr(win,y,x,str)         (wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,-1))
+-#define mvwdelch(win,y,x)              (wmove(win,y,x) == ERR ? ERR : wdelch(win))
+-#define mvwchgat(win,y,x,n,a,c,o)      (wmove(win,y,x) == ERR ? ERR : wchgat(win,n,a,c,o))
+-#define mvwgetch(win,y,x)              (wmove(win,y,x) == ERR ? ERR : wgetch(win))
+-#define mvwgetnstr(win,y,x,str,n)      (wmove(win,y,x) == ERR ? ERR : wgetnstr(win,str,n))
+-#define mvwgetstr(win,y,x,str)         (wmove(win,y,x) == ERR ? ERR : wgetstr(win,str))
+-#define mvwhline(win,y,x,c,n)          (wmove(win,y,x) == ERR ? ERR : whline(win,c,n))
+-#define mvwinch(win,y,x)               (wmove(win,y,x) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
+-#define mvwinchnstr(win,y,x,s,n)       (wmove(win,y,x) == ERR ? ERR : winchnstr(win,s,n))
+-#define mvwinchstr(win,y,x,s)          (wmove(win,y,x) == ERR ? ERR : winchstr(win,s))
+-#define mvwinnstr(win,y,x,s,n)         (wmove(win,y,x) == ERR ? ERR : winnstr(win,s,n))
+-#define mvwinsch(win,y,x,c)            (wmove(win,y,x) == ERR ? ERR : winsch(win,c))
+-#define mvwinsnstr(win,y,x,s,n)                (wmove(win,y,x) == ERR ? ERR : winsnstr(win,s,n))
+-#define mvwinsstr(win,y,x,s)           (wmove(win,y,x) == ERR ? ERR : winsstr(win,s))
+-#define mvwinstr(win,y,x,s)            (wmove(win,y,x) == ERR ? ERR : winstr(win,s))
+-#define mvwvline(win,y,x,c,n)          (wmove(win,y,x) == ERR ? ERR : wvline(win,c,n))
+-
+-#define mvaddch(y,x,ch)                        mvwaddch(stdscr,y,x,ch)
+-#define mvaddchnstr(y,x,str,n)         mvwaddchnstr(stdscr,y,x,str,n)
+-#define mvaddchstr(y,x,str)            mvwaddchstr(stdscr,y,x,str)
+-#define mvaddnstr(y,x,str,n)           mvwaddnstr(stdscr,y,x,str,n)
+-#define mvaddstr(y,x,str)              mvwaddstr(stdscr,y,x,str)
+-#define mvchgat(y,x,n,a,c,o)           mvwchgat(stdscr,y,x,n,a,c,o)
+-#define mvdelch(y,x)                   mvwdelch(stdscr,y,x)
+-#define mvgetch(y,x)                   mvwgetch(stdscr,y,x)
+-#define mvgetnstr(y,x,str,n)           mvwgetnstr(stdscr,y,x,str,n)
+-#define mvgetstr(y,x,str)              mvwgetstr(stdscr,y,x,str)
+-#define mvhline(y,x,c,n)               mvwhline(stdscr,y,x,c,n)
+-#define mvinch(y,x)                    mvwinch(stdscr,y,x)
+-#define mvinchnstr(y,x,s,n)            mvwinchnstr(stdscr,y,x,s,n)
+-#define mvinchstr(y,x,s)               mvwinchstr(stdscr,y,x,s)
+-#define mvinnstr(y,x,s,n)              mvwinnstr(stdscr,y,x,s,n)
+-#define mvinsch(y,x,c)                 mvwinsch(stdscr,y,x,c)
+-#define mvinsnstr(y,x,s,n)             mvwinsnstr(stdscr,y,x,s,n)
+-#define mvinsstr(y,x,s)                        mvwinsstr(stdscr,y,x,s)
+-#define mvinstr(y,x,s)                 mvwinstr(stdscr,y,x,s)
+-#define mvvline(y,x,c,n)               mvwvline(stdscr,y,x,c,n)
++#define mvwaddch(win,y,x,ch)           (wmove((win),(y),(x)) == ERR ? ERR : waddch((win),(ch)))
++#define mvwaddchnstr(win,y,x,str,n)    (wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),(n)))
++#define mvwaddchstr(win,y,x,str)       (wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1))
++#define mvwaddnstr(win,y,x,str,n)      (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n)))
++#define mvwaddstr(win,y,x,str)         (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1))
++#define mvwdelch(win,y,x)              (wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
++#define mvwchgat(win,y,x,n,a,c,o)      (wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o)))
++#define mvwgetch(win,y,x)              (wmove((win),(y),(x)) == ERR ? ERR : wgetch(win))
++#define mvwgetnstr(win,y,x,str,n)      (wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n)))
++#define mvwgetstr(win,y,x,str)         (wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str)))
++#define mvwhline(win,y,x,c,n)          (wmove((win),(y),(x)) == ERR ? ERR : whline((win),(c),(n)))
++#define mvwinch(win,y,x)               (wmove((win),(y),(x)) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
++#define mvwinchnstr(win,y,x,s,n)       (wmove((win),(y),(x)) == ERR ? ERR : winchnstr((win),(s),(n)))
++#define mvwinchstr(win,y,x,s)          (wmove((win),(y),(x)) == ERR ? ERR : winchstr((win),(s)))
++#define mvwinnstr(win,y,x,s,n)         (wmove((win),(y),(x)) == ERR ? ERR : winnstr((win),(s),(n)))
++#define mvwinsch(win,y,x,c)            (wmove((win),(y),(x)) == ERR ? ERR : winsch((win),(c)))
++#define mvwinsnstr(win,y,x,s,n)                (wmove((win),(y),(x)) == ERR ? ERR : winsnstr((win),(s),(n)))
++#define mvwinsstr(win,y,x,s)           (wmove((win),(y),(x)) == ERR ? ERR : winsstr((win),(s)))
++#define mvwinstr(win,y,x,s)            (wmove((win),(y),(x)) == ERR ? ERR : winstr((win),(s)))
++#define mvwvline(win,y,x,c,n)          (wmove((win),(y),(x)) == ERR ? ERR : wvline((win),(c),(n)))
++
++#define mvaddch(y,x,ch)                        mvwaddch(stdscr,(y),(x),(ch))
++#define mvaddchnstr(y,x,str,n)         mvwaddchnstr(stdscr,(y),(x),(str),(n))
++#define mvaddchstr(y,x,str)            mvwaddchstr(stdscr,(y),(x),(str))
++#define mvaddnstr(y,x,str,n)           mvwaddnstr(stdscr,(y),(x),(str),(n))
++#define mvaddstr(y,x,str)              mvwaddstr(stdscr,(y),(x),(str))
++#define mvchgat(y,x,n,a,c,o)           mvwchgat(stdscr,(y),(x),(n),(a),(c),(o))
++#define mvdelch(y,x)                   mvwdelch(stdscr,(y),(x))
++#define mvgetch(y,x)                   mvwgetch(stdscr,(y),(x))
++#define mvgetnstr(y,x,str,n)           mvwgetnstr(stdscr,(y),(x),(str),(n))
++#define mvgetstr(y,x,str)              mvwgetstr(stdscr,(y),(x),(str))
++#define mvhline(y,x,c,n)               mvwhline(stdscr,(y),(x),(c),(n))
++#define mvinch(y,x)                    mvwinch(stdscr,(y),(x))
++#define mvinchnstr(y,x,s,n)            mvwinchnstr(stdscr,(y),(x),(s),(n))
++#define mvinchstr(y,x,s)               mvwinchstr(stdscr,(y),(x),(s))
++#define mvinnstr(y,x,s,n)              mvwinnstr(stdscr,(y),(x),(s),(n))
++#define mvinsch(y,x,c)                 mvwinsch(stdscr,(y),(x),(c))
++#define mvinsnstr(y,x,s,n)             mvwinsnstr(stdscr,(y),(x),(s),(n))
++#define mvinsstr(y,x,s)                        mvwinsstr(stdscr,(y),(x),(s))
++#define mvinstr(y,x,s)                 mvwinstr(stdscr,(y),(x),(s))
++#define mvvline(y,x,c,n)               mvwvline(stdscr,(y),(x),(c),(n))
+ 
+ /*
   * Some wide-character functions can be implemented without the extensions.
   */
@@ -29962 +35126 @@
  #endif
  #endif /* NCURSES_OPAQUE */
+@@ -1291,7 +1311,7 @@
+  * Export fallback function for use in C++ binding.
+  */
+ #if !@HAVE_VSSCANF@
+-#define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
++#define vsscanf(a,b,c) _nc_vsscanf((a),(b),(c))
+ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
+ #endif
+ 
 diff -Naur ncurses-5.9.orig/include/curses.tail ncurses-5.9/include/curses.tail
---- ncurses-5.9.orig/include/curses.tail        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/curses.tail     2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/curses.tail        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/curses.tail     2012-08-25 19:57:59.986564839 +0000
 @@ -1,4 +1,4 @@
 -/* $Id: curses.tail,v 1.20 2010/03/28 19:10:55 tom Exp $ */
@@ -29981 +35154 @@
  #define _tracech_t2            _tracecchar_t2
 diff -Naur ncurses-5.9.orig/include/curses.wide ncurses-5.9/include/curses.wide
---- ncurses-5.9.orig/include/curses.wide        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/curses.wide     2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/curses.wide        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/curses.wide     2012-08-25 19:58:02.046555098 +0000
 @@ -1,4 +1,4 @@
 -/* $Id: curses.wide,v 1.42 2010/03/30 00:39:41 tom Exp $ */
-+/* $Id: curses.wide,v 1.44 2011/10/29 20:08:19 tom Exp $ */
++/* $Id: curses.wide,v 1.45 2012/07/28 18:10:02 tom Exp $ */
  /*
   * vile:cmode:
   * This file is part of ncurses, designed to be appended after curses.h.in
-@@ -6,7 +6,7 @@
+@@ -6,11 +6,11 @@
   */
  #define _XOPEN_CURSES 1
@@ -29998 +35171 @@
  extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
  
-@@ -261,7 +261,7 @@
- #define wins_wstr(w,t)                 wins_nwstr(w,t,-1)
+-#define NCURSES_WACS(c)        (&_nc_wacs[(unsigned char)c])
++#define NCURSES_WACS(c)        (&_nc_wacs[NCURSES_CAST(unsigned char,(c))])
+ 
+ #define WACS_BSSB      NCURSES_WACS('l')
+ #define WACS_SSBB      NCURSES_WACS('m')
+@@ -230,77 +230,77 @@
+ /*
+  * XSI curses macros for XPG4 conformance.
+  */
+-#define add_wch(c)                     wadd_wch(stdscr,c)
+-#define add_wchnstr(str,n)             wadd_wchnstr(stdscr,str,n)
+-#define add_wchstr(str)                        wadd_wchstr(stdscr,str)
+-#define addnwstr(wstr,n)               waddnwstr(stdscr,wstr,n)
+-#define addwstr(wstr)                  waddwstr(stdscr,wstr)
+-#define bkgrnd(c)                      wbkgrnd(stdscr,c)
+-#define bkgrndset(c)                   wbkgrndset(stdscr,c)
+-#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,l,r,t,b,tl,tr,bl,br)
+-#define box_set(w,v,h)                 wborder_set(w,v,v,h,h,0,0,0,0)
+-#define echo_wchar(c)                  wecho_wchar(stdscr,c)
+-#define get_wch(c)                     wget_wch(stdscr,c)
+-#define get_wstr(t)                    wget_wstr(stdscr,t)
+-#define getbkgrnd(wch)                 wgetbkgrnd(stdscr,wch)
+-#define getn_wstr(t,n)                 wgetn_wstr(stdscr,t,n)
+-#define hline_set(c,n)                 whline_set(stdscr,c,n)
+-#define in_wch(c)                      win_wch(stdscr,c)
+-#define in_wchnstr(c,n)                        win_wchnstr(stdscr,c,n)
+-#define in_wchstr(c)                   win_wchstr(stdscr,c)
+-#define innwstr(c,n)                   winnwstr(stdscr,c,n)
+-#define ins_nwstr(t,n)                 wins_nwstr(stdscr,t,n)
+-#define ins_wch(c)                     wins_wch(stdscr,c)
+-#define ins_wstr(t)                    wins_wstr(stdscr,t)
+-#define inwstr(c)                      winwstr(stdscr,c)
+-#define vline_set(c,n)                 wvline_set(stdscr,c,n)
+-#define wadd_wchstr(win,str)           wadd_wchnstr(win,str,-1)
+-#define waddwstr(win,wstr)             waddnwstr(win,wstr,-1)
+-#define wget_wstr(w,t)                 wgetn_wstr(w,t,-1)
+-#define win_wchstr(w,c)                        win_wchnstr(w,c,-1)
+-#define wins_wstr(w,t)                 wins_nwstr(w,t,-1)
++#define add_wch(c)                     wadd_wch(stdscr,(c))
++#define add_wchnstr(str,n)             wadd_wchnstr(stdscr,(str),(n))
++#define add_wchstr(str)                        wadd_wchstr(stdscr,(str))
++#define addnwstr(wstr,n)               waddnwstr(stdscr,(wstr),(n))
++#define addwstr(wstr)                  waddwstr(stdscr,(wstr))
++#define bkgrnd(c)                      wbkgrnd(stdscr,(c))
++#define bkgrndset(c)                   wbkgrndset(stdscr,(c))
++#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,(l),(r),(t),(b),tl,tr,bl,br)
++#define box_set(w,v,h)                 wborder_set((w),(v),(v),(h),(h),0,0,0,0)
++#define echo_wchar(c)                  wecho_wchar(stdscr,(c))
++#define get_wch(c)                     wget_wch(stdscr,(c))
++#define get_wstr(t)                    wget_wstr(stdscr,(t))
++#define getbkgrnd(wch)                 wgetbkgrnd(stdscr,(wch))
++#define getn_wstr(t,n)                 wgetn_wstr(stdscr,(t),(n))
++#define hline_set(c,n)                 whline_set(stdscr,(c),(n))
++#define in_wch(c)                      win_wch(stdscr,(c))
++#define in_wchnstr(c,n)                        win_wchnstr(stdscr,(c),(n))
++#define in_wchstr(c)                   win_wchstr(stdscr,(c))
++#define innwstr(c,n)                   winnwstr(stdscr,(c),(n))
++#define ins_nwstr(t,n)                 wins_nwstr(stdscr,(t),(n))
++#define ins_wch(c)                     wins_wch(stdscr,(c))
++#define ins_wstr(t)                    wins_wstr(stdscr,(t))
++#define inwstr(c)                      winwstr(stdscr,(c))
++#define vline_set(c,n)                 wvline_set(stdscr,(c),(n))
++#define wadd_wchstr(win,str)           wadd_wchnstr((win),(str),-1)
++#define waddwstr(win,wstr)             waddnwstr((win),(wstr),-1)
++#define wget_wstr(w,t)                 wgetn_wstr((w),(t),-1)
++#define win_wchstr(w,c)                        win_wchnstr((w),(c),-1)
++#define wins_wstr(w,t)                 wins_nwstr((w),(t),-1)
  
  #if !NCURSES_OPAQUE
@@ -30006 +35244 @@
  #endif
  
- #define mvadd_wch(y,x,c)               mvwadd_wch(stdscr,y,x,c)
+-#define mvadd_wch(y,x,c)               mvwadd_wch(stdscr,y,x,c)
+-#define mvadd_wchnstr(y,x,s,n)         mvwadd_wchnstr(stdscr,y,x,s,n)
+-#define mvadd_wchstr(y,x,s)            mvwadd_wchstr(stdscr,y,x,s)
+-#define mvaddnwstr(y,x,wstr,n)         mvwaddnwstr(stdscr,y,x,wstr,n)
+-#define mvaddwstr(y,x,wstr)            mvwaddwstr(stdscr,y,x,wstr)
+-#define mvget_wch(y,x,c)               mvwget_wch(stdscr,y,x,c)
+-#define mvget_wstr(y,x,t)              mvwget_wstr(stdscr,y,x,t)
+-#define mvgetn_wstr(y,x,t,n)           mvwgetn_wstr(stdscr,y,x,t,n)
+-#define mvhline_set(y,x,c,n)           mvwhline_set(stdscr,y,x,c,n)
+-#define mvin_wch(y,x,c)                        mvwin_wch(stdscr,y,x,c)
+-#define mvin_wchnstr(y,x,c,n)          mvwin_wchnstr(stdscr,y,x,c,n)
+-#define mvin_wchstr(y,x,c)             mvwin_wchstr(stdscr,y,x,c)
+-#define mvinnwstr(y,x,c,n)             mvwinnwstr(stdscr,y,x,c,n)
+-#define mvins_nwstr(y,x,t,n)           mvwins_nwstr(stdscr,y,x,t,n)
+-#define mvins_wch(y,x,c)               mvwins_wch(stdscr,y,x,c)
+-#define mvins_wstr(y,x,t)              mvwins_wstr(stdscr,y,x,t)
+-#define mvinwstr(y,x,c)                        mvwinwstr(stdscr,y,x,c)
+-#define mvvline_set(y,x,c,n)           mvwvline_set(stdscr,y,x,c,n)
+-
+-#define mvwadd_wch(win,y,x,c)          (wmove(win,y,x) == ERR ? ERR : wadd_wch(win,c))
+-#define mvwadd_wchnstr(win,y,x,s,n)    (wmove(win,y,x) == ERR ? ERR : wadd_wchnstr(win,s,n))
+-#define mvwadd_wchstr(win,y,x,s)       (wmove(win,y,x) == ERR ? ERR : wadd_wchstr(win,s))
+-#define mvwaddnwstr(win,y,x,wstr,n)    (wmove(win,y,x) == ERR ? ERR : waddnwstr(win,wstr,n))
+-#define mvwaddwstr(win,y,x,wstr)       (wmove(win,y,x) == ERR ? ERR : waddwstr(win,wstr))
+-#define mvwget_wch(win,y,x,c)          (wmove(win,y,x) == ERR ? ERR : wget_wch(win,c))
+-#define mvwget_wstr(win,y,x,t)         (wmove(win,y,x) == ERR ? ERR : wget_wstr(win,t))
+-#define mvwgetn_wstr(win,y,x,t,n)      (wmove(win,y,x) == ERR ? ERR : wgetn_wstr(win,t,n))
+-#define mvwhline_set(win,y,x,c,n)      (wmove(win,y,x) == ERR ? ERR : whline_set(win,c,n))
+-#define mvwin_wch(win,y,x,c)           (wmove(win,y,x) == ERR ? ERR : win_wch(win,c))
+-#define mvwin_wchnstr(win,y,x,c,n)     (wmove(win,y,x) == ERR ? ERR : win_wchnstr(win,c,n))
+-#define mvwin_wchstr(win,y,x,c)                (wmove(win,y,x) == ERR ? ERR : win_wchstr(win,c))
+-#define mvwinnwstr(win,y,x,c,n)                (wmove(win,y,x) == ERR ? ERR : winnwstr(win,c,n))
+-#define mvwins_nwstr(win,y,x,t,n)      (wmove(win,y,x) == ERR ? ERR : wins_nwstr(win,t,n))
+-#define mvwins_wch(win,y,x,c)          (wmove(win,y,x) == ERR ? ERR : wins_wch(win,c))
+-#define mvwins_wstr(win,y,x,t)         (wmove(win,y,x) == ERR ? ERR : wins_wstr(win,t))
+-#define mvwinwstr(win,y,x,c)           (wmove(win,y,x) == ERR ? ERR : winwstr(win,c))
+-#define mvwvline_set(win,y,x,c,n)      (wmove(win,y,x) == ERR ? ERR : wvline_set(win,c,n))
++#define mvadd_wch(y,x,c)               mvwadd_wch(stdscr,(y),(x),(c))
++#define mvadd_wchnstr(y,x,s,n)         mvwadd_wchnstr(stdscr,(y),(x),(s),(n))
++#define mvadd_wchstr(y,x,s)            mvwadd_wchstr(stdscr,(y),(x),(s))
++#define mvaddnwstr(y,x,wstr,n)         mvwaddnwstr(stdscr,(y),(x),(wstr),(n))
++#define mvaddwstr(y,x,wstr)            mvwaddwstr(stdscr,(y),(x),(wstr))
++#define mvget_wch(y,x,c)               mvwget_wch(stdscr,(y),(x),(c))
++#define mvget_wstr(y,x,t)              mvwget_wstr(stdscr,(y),(x),(t))
++#define mvgetn_wstr(y,x,t,n)           mvwgetn_wstr(stdscr,(y),(x),(t),(n))
++#define mvhline_set(y,x,c,n)           mvwhline_set(stdscr,(y),(x),(c),(n))
++#define mvin_wch(y,x,c)                        mvwin_wch(stdscr,(y),(x),(c))
++#define mvin_wchnstr(y,x,c,n)          mvwin_wchnstr(stdscr,(y),(x),(c),(n))
++#define mvin_wchstr(y,x,c)             mvwin_wchstr(stdscr,(y),(x),(c))
++#define mvinnwstr(y,x,c,n)             mvwinnwstr(stdscr,(y),(x),(c),(n))
++#define mvins_nwstr(y,x,t,n)           mvwins_nwstr(stdscr,(y),(x),(t),(n))
++#define mvins_wch(y,x,c)               mvwins_wch(stdscr,(y),(x),(c))
++#define mvins_wstr(y,x,t)              mvwins_wstr(stdscr,(y),(x),(t))
++#define mvinwstr(y,x,c)                        mvwinwstr(stdscr,(y),(x),(c))
++#define mvvline_set(y,x,c,n)           mvwvline_set(stdscr,(y),(x),(c),(n))
++
++#define mvwadd_wch(win,y,x,c)          (wmove(win,(y),(x)) == ERR ? ERR : wadd_wch((win),(c)))
++#define mvwadd_wchnstr(win,y,x,s,n)    (wmove(win,(y),(x)) == ERR ? ERR : wadd_wchnstr((win),(s),(n)))
++#define mvwadd_wchstr(win,y,x,s)       (wmove(win,(y),(x)) == ERR ? ERR : wadd_wchstr((win),(s)))
++#define mvwaddnwstr(win,y,x,wstr,n)    (wmove(win,(y),(x)) == ERR ? ERR : waddnwstr((win),(wstr),(n)))
++#define mvwaddwstr(win,y,x,wstr)       (wmove(win,(y),(x)) == ERR ? ERR : waddwstr((win),(wstr)))
++#define mvwget_wch(win,y,x,c)          (wmove(win,(y),(x)) == ERR ? ERR : wget_wch((win),(c)))
++#define mvwget_wstr(win,y,x,t)         (wmove(win,(y),(x)) == ERR ? ERR : wget_wstr((win),(t)))
++#define mvwgetn_wstr(win,y,x,t,n)      (wmove(win,(y),(x)) == ERR ? ERR : wgetn_wstr((win),(t),(n)))
++#define mvwhline_set(win,y,x,c,n)      (wmove(win,(y),(x)) == ERR ? ERR : whline_set((win),(c),(n)))
++#define mvwin_wch(win,y,x,c)           (wmove(win,(y),(x)) == ERR ? ERR : win_wch((win),(c)))
++#define mvwin_wchnstr(win,y,x,c,n)     (wmove(win,(y),(x)) == ERR ? ERR : win_wchnstr((win),(c),(n)))
++#define mvwin_wchstr(win,y,x,c)                (wmove(win,(y),(x)) == ERR ? ERR : win_wchstr((win),(c)))
++#define mvwinnwstr(win,y,x,c,n)                (wmove(win,(y),(x)) == ERR ? ERR : winnwstr((win),(c),(n)))
++#define mvwins_nwstr(win,y,x,t,n)      (wmove(win,(y),(x)) == ERR ? ERR : wins_nwstr((win),(t),(n)))
++#define mvwins_wch(win,y,x,c)          (wmove(win,(y),(x)) == ERR ? ERR : wins_wch((win),(c)))
++#define mvwins_wstr(win,y,x,t)         (wmove(win,(y),(x)) == ERR ? ERR : wins_wstr((win),(t)))
++#define mvwinwstr(win,y,x,c)           (wmove(win,(y),(x)) == ERR ? ERR : winwstr((win),(c)))
++#define mvwvline_set(win,y,x,c,n)      (wmove(win,(y),(x)) == ERR ? ERR : wvline_set((win),(c),(n)))
+ 
+ #endif /* NCURSES_NOMACROS */
+ 
+diff -Naur ncurses-5.9.orig/include/headers ncurses-5.9/include/headers
+--- ncurses-5.9.orig/include/headers    2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/headers 2012-08-25 19:58:02.046555098 +0000
+@@ -1,6 +1,6 @@
+-# $Id: headers,v 1.10 2009/09/05 17:46:30 tom Exp $
++# $Id: headers,v 1.12 2012/07/28 22:41:34 Roumen.Petrov Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -29,14 +29,23 @@
+ #
+ # Author: Thomas E. Dickey     1996-on
+ #
+-term.h
+ curses.h
+ unctrl.h
+-termcap.h
+ ncurses_dll.h
++
++# Support for termcap (and tic, etc.), which can be a separate library
++@ termlib
++term.h
++termcap.h
++
++# Headers used only for tic, other programs using internal interfaces
+ @ ticlib
+ $(srcdir)/tic.h
+ $(srcdir)/term_entry.h
+ $(srcdir)/nc_tparm.h
+ 
++# Porting
++@ port_win32con
++$(srcdir)/ncurses_mingw.h
++
+ # vile:makemode
 diff -Naur ncurses-5.9.orig/include/nc_alloc.h ncurses-5.9/include/nc_alloc.h
---- ncurses-5.9.orig/include/nc_alloc.h 2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/nc_alloc.h      2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/nc_alloc.h 2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/nc_alloc.h      2012-08-25 19:57:59.989898157 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -30048 +35400 @@
 +
  #endif /* NC_ALLOC_included */
+diff -Naur ncurses-5.9.orig/include/nc_string.h ncurses-5.9/include/nc_string.h
+--- ncurses-5.9.orig/include/nc_string.h        1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/include/nc_string.h     2012-08-25 19:58:00.906560490 +0000
+@@ -0,0 +1,77 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey                        2012                    *
++ ****************************************************************************/
++
++#ifndef STRING_HACKS_H
++#define STRING_HACKS_H 1
++
++#include <ncurses_cfg.h>
++
++/*
++ * $Id: nc_string.h,v 1.3 2012/02/23 10:21:17 tom Exp $
++ *
++ * String-hacks.  Use these macros to stifle warnings on (presumably) correct
++ * uses of strcat, strcpy and sprintf.
++ *
++ * By the way -
++ * A fundamental limitation of the interfaces (and frequent issue in bug
++ * reports using these functions) is that sizes are passed as unsigned values
++ * (with associated sign-extension problems), limiting their effectiveness
++ * when checking for buffer overflow.
++ */
++
++#ifdef __cplusplus
++#define NCURSES_VOID /* nothing */
++#else
++#define NCURSES_VOID (void)
++#endif
++
++#if USE_STRING_HACKS && HAVE_STRLCAT
++#define _nc_STRCAT(d,s,n)      NCURSES_VOID strlcat((d),(s),(n))
++#else
++#define _nc_STRCAT(d,s,n)      NCURSES_VOID strcat((d),(s))
++#endif
++
++#if USE_STRING_HACKS && HAVE_STRLCPY
++#define _nc_STRCPY(d,s,n)      NCURSES_VOID strlcpy((d),(s),(n))
++#else
++#define _nc_STRCPY(d,s,n)      NCURSES_VOID strcpy((d),(s))
++#endif
++
++#if USE_STRING_HACKS && HAVE_SNPRINTF
++#define _nc_SPRINTF             NCURSES_VOID snprintf
++#define _nc_SLIMIT(n)           (n),
++#else
++#define _nc_SPRINTF             NCURSES_VOID sprintf
++#define _nc_SLIMIT(n)          /* nothing */
++#endif
++
++#endif /* STRING_HACKS_H */
 diff -Naur ncurses-5.9.orig/include/nc_termios.h ncurses-5.9/include/nc_termios.h
 --- ncurses-5.9.orig/include/nc_termios.h       1970-01-01 00:00:00.000000000 +0000
-+++ ncurses-5.9/include/nc_termios.h    2012-02-16 18:25:12.955817851 +0000
++++ ncurses-5.9/include/nc_termios.h    2012-08-25 19:57:59.989898157 +0000
 @@ -0,0 +1,171 @@
 +/****************************************************************************
@@ -30223 +35656 @@
 +
 +#endif /* NC_TERMIOS_included */
+diff -Naur ncurses-5.9.orig/include/nc_tparm.h ncurses-5.9/include/nc_tparm.h
+--- ncurses-5.9.orig/include/nc_tparm.h 2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/nc_tparm.h      2012-08-25 19:58:00.829894185 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2006,2010 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,7 +30,7 @@
+  *  Author: Thomas E. Dickey                        2006                    *
+  ****************************************************************************/
+ 
+-/* $Id: nc_tparm.h,v 1.5 2010/12/25 20:27:22 tom Exp $ */
++/* $Id: nc_tparm.h,v 1.6 2012/02/18 21:34:42 tom Exp $ */
+ 
+ #ifndef NC_TPARM_included
+ #define NC_TPARM_included 1
+@@ -40,8 +40,12 @@
+  * assumption of the varargs code.
+  */
+ #ifndef TPARM_ARG
++#ifdef NCURSES_TPARM_ARG
++#define TPARM_ARG NCURSES_TPARM_ARG
++#else
+ #define TPARM_ARG long
+ #endif
++#endif /* TPARAM_ARG */
+ 
+ #define TPARM_N(n) (TPARM_ARG)(n)
+ 
 diff -Naur ncurses-5.9.orig/include/ncurses_defs ncurses-5.9/include/ncurses_defs
---- ncurses-5.9.orig/include/ncurses_defs       2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/ncurses_defs    2012-02-16 18:25:12.955817851 +0000
-@@ -1,4 +1,4 @@
+--- ncurses-5.9.orig/include/ncurses_defs       2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/ncurses_defs    2012-08-25 19:58:01.933222301 +0000
+@@ -1,6 +1,6 @@
 -# $Id: ncurses_defs,v 1.46 2011/03/22 09:17:59 tom Exp $
-+# $Id: ncurses_defs,v 1.52 2011/12/17 18:14:30 tom Exp $
++# $Id: ncurses_defs,v 1.54 2012/07/14 21:03:29 tom Exp $
  ##############################################################################
- # Copyright (c) 2000-2010,2011 Free Software Foundation, Inc.                #
+-# Copyright (c) 2000-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 2000-2011,2012 Free Software Foundation, Inc.                #
  #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
 @@ -34,6 +34,7 @@
  BROKEN_LINKER
@@ -30248 +35716 @@
  HAVE_BSD_CGETENT
  HAVE_BSD_SIGNAL_H
-@@ -123,6 +125,7 @@
+@@ -102,6 +104,7 @@
+ HAVE_POLL
+ HAVE_POLL_H
+ HAVE_PURIFY
++HAVE_PUTENV
+ HAVE_PUTWC 
+ HAVE_PUTWIN    1
+ HAVE_REGEXPR_H_FUNCS
+@@ -115,6 +118,7 @@
+ HAVE_SELECT
+ HAVE_SETBUF
+ HAVE_SETBUFFER
++HAVE_SETENV
+ HAVE_SETUPTERM 1
+ HAVE_SETVBUF
+ HAVE_SGTTY_H
+@@ -123,7 +127,11 @@
  HAVE_SIZECHANGE
  HAVE_SLK_COLOR
  HAVE_SLK_INIT  1
++HAVE_SNPRINTF
 +HAVE_STDINT_H
  HAVE_STRDUP
++HAVE_STRLCAT
++HAVE_STRLCPY
  HAVE_STRSTR
  HAVE_SYMLINK
-@@ -153,9 +156,12 @@
+ HAVE_SYS_BSDTYPES_H
+@@ -153,9 +161,12 @@
  HAVE_TYPEINFO
  HAVE_TYPE_ATTR_T
@@ -30269 +35757 @@
  HAVE_VSNPRINTF
  HAVE_VSSCANF
-@@ -176,6 +182,7 @@
+@@ -176,6 +187,7 @@
  NCURSES_EXT_FUNCS
  NCURSES_NO_PADDING
@@ -30277 +35765 @@
  NO_LEAKS
  PURE_TERMINFO
+@@ -205,6 +217,7 @@
+ USE_SAFE_SPRINTF
+ USE_SCROLL_HINTS
+ USE_SIGWINCH
++USE_STRING_HACKS
+ USE_SYMLINKS
+ USE_SYSMOUSE
+ USE_TERMCAP
 diff -Naur ncurses-5.9.orig/include/ncurses_mingw.h ncurses-5.9/include/ncurses_mingw.h
---- ncurses-5.9.orig/include/ncurses_mingw.h    2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/ncurses_mingw.h 2012-02-16 18:25:12.955817851 +0000
+--- ncurses-5.9.orig/include/ncurses_mingw.h    2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/ncurses_mingw.h 2012-08-25 19:57:59.993231475 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -30402 +35898 @@
 +#endif /* __MINGW32__ */
 diff -Naur ncurses-5.9.orig/include/term_entry.h ncurses-5.9/include/term_entry.h
---- ncurses-5.9.orig/include/term_entry.h       2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/term_entry.h    2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/include/term_entry.h       2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/term_entry.h    2012-08-25 19:58:00.956560253 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30416 +35912 @@
  
 -/* $Id: term_entry.h,v 1.37 2009/07/11 16:52:29 tom Exp $ */
-+/* $Id: term_entry.h,v 1.40 2011/10/08 21:00:41 tom Exp $ */
++/* $Id: term_entry.h,v 1.41 2012/02/29 11:57:03 tom Exp $ */
  
  /*
@@ -30445 +35941 @@
  #define MAX_CROSSLINKS 16
  
+@@ -132,7 +150,7 @@
+ 
+ /* alloc_ttype.c: elementary allocation code */
+ extern NCURSES_EXPORT(void) _nc_align_termtype (TERMTYPE *, TERMTYPE *);
+-extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, TERMTYPE *);
++extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, const TERMTYPE *);
+ 
+ /* free_ttype.c: elementary allocation code */
+ extern NCURSES_EXPORT(void) _nc_free_termtype (TERMTYPE *);
 diff -Naur ncurses-5.9.orig/include/tic.h ncurses-5.9/include/tic.h
---- ncurses-5.9.orig/include/tic.h      2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/include/tic.h   2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/include/tic.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/include/tic.h   2012-08-25 19:58:01.036559874 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -33,7 +33,7 @@
+@@ -33,14 +33,14 @@
   ****************************************************************************/
  
  /*
 - * $Id: tic.h,v 1.65 2009/08/08 17:52:46 tom Exp $
-+ * $Id: tic.h,v 1.67 2011/10/08 21:00:50 tom Exp $
++ * $Id: tic.h,v 1.69 2012/03/17 18:22:10 tom Exp $
   *     tic.h - Global variables and structures for the terminfo
   *                     compiler.
   */
-@@ -270,6 +270,7 @@
+ 
+ #ifndef __TIC_H
+ #define __TIC_H
+-
++/* *INDENT-OFF* */
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -224,6 +224,12 @@
+ 
+ #define NOTFOUND       ((struct name_table_entry *) 0)
+ 
++/*
++ * The casts are required for correct sign-propagation with systems such as
++ * AIX, IRIX64, Solaris which default to unsigned characters.  The C standard
++ * leaves this detail unspecified.
++ */
++
+ /* out-of-band values for representing absent capabilities */
+ #define ABSENT_BOOLEAN         ((signed char)-1)       /* 255 */
+ #define ABSENT_NUMERIC         (-1)
+@@ -248,6 +254,8 @@
+ #define TERMINFO "/usr/share/terminfo"
+ #endif
+ 
++#ifdef NCURSES_TERM_ENTRY_H_incl
++
+ /* access.c */
+ extern NCURSES_EXPORT(unsigned) _nc_pathlast (const char *);
+ extern NCURSES_EXPORT(bool) _nc_is_abs_path (const char *);
+@@ -270,6 +278,7 @@
  extern NCURSES_EXPORT_VAR(int) _nc_curr_col;
  extern NCURSES_EXPORT_VAR(int) _nc_curr_line;
@@ -30472 +36007 @@
  extern NCURSES_EXPORT_VAR(long) _nc_comment_start;
  extern NCURSES_EXPORT_VAR(long) _nc_curr_file_pos;
-@@ -314,23 +315,6 @@
+@@ -314,23 +323,6 @@
  extern const char * _nc_progname;
  
@@ -30496 +36031 @@
  extern NCURSES_EXPORT(const char *) _nc_tic_dir (const char *);
  extern NCURSES_EXPORT(void) _nc_first_db(DBDIRS *, int *);
+@@ -339,8 +331,11 @@
+ /* write_entry.c */
+ extern NCURSES_EXPORT(int) _nc_tic_written (void);
+ 
++#endif /* NCURSES_TERM_ENTRY_H_incl */
++
+ #ifdef __cplusplus
+ }
+ #endif
+ 
++/* *INDENT-ON* */
+ #endif /* __TIC_H */
+diff -Naur ncurses-5.9.orig/man/Makefile.in ncurses-5.9/man/Makefile.in
+--- ncurses-5.9.orig/man/Makefile.in    2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/Makefile.in 2012-08-25 19:58:02.359886951 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.45 2010/11/27 21:45:27 tom Exp $
++# $Id: Makefile.in,v 1.46 2012/08/11 21:31:56 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -41,6 +41,7 @@
+ srcdir         = @srcdir@
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ mandir         = @mandir@
+ 
+diff -Naur ncurses-5.9.orig/man/curs_getch.3x ncurses-5.9/man/curs_getch.3x
+--- ncurses-5.9.orig/man/curs_getch.3x  2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/curs_getch.3x       2012-08-25 19:58:01.893222491 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.36 2011/01/22 19:38:51 tom Exp $
++.\" $Id: curs_getch.3x,v 1.37 2012/07/07 20:04:56 tom Exp $
+ .TH curs_getch 3X ""
+ .na
+ .hy 0
+@@ -237,14 +237,14 @@
+ All routines return the integer \fBERR\fR upon failure and an integer value
+ other than \fBERR\fR (\fBOK\fR in the case of ungetch()) upon successful
+ completion.
+-.RS
++.RS 3
+ .TP 5
+ \fBungetch\fP
+-returns an error
++returns ERR
+ if there is no more room in the FIFO.
+-.TP 5
++.TP
+ \fBwgetch\fP
+-returns an error
++returns ERR
+ if the window pointer is null, or
+ if its timeout expires without having any data.
+ .RE
+diff -Naur ncurses-5.9.orig/man/curs_inopts.3x ncurses-5.9/man/curs_inopts.3x
+--- ncurses-5.9.orig/man/curs_inopts.3x 2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/man/curs_inopts.3x      2012-08-25 19:58:01.296558645 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.15 2010/12/04 18:40:45 tom Exp $
++.\" $Id: curs_inopts.3x,v 1.17 2012/04/28 19:09:15 tom Exp $
+ .TH curs_inopts 3X ""
+ .na
+ .hy 0
+@@ -223,6 +223,42 @@
+ left the echo bit on at initialization, but the BSD \fBraw\fR call turned it
+ off as a side-effect.  For best portability, set echo or noecho explicitly
+ just after initialization, even if your program remains in cooked mode.
++.PP
++When \fBkeypad\fP is first enabled,
++ncurses loads the key-definitions for the current terminal description.
++If the terminal description includes extended string capabilities,
++e.g., from using the \fB\-x\fP option of @TIC@,
++then ncurses also defines keys for the capabilities whose names
++begin with "k".
++The corresponding keycodes are generated and (depending on previous
++loads of terminal descriptions) may differ from one execution of a
++program to the next.
++The generated keycodes are recognized by the \fBkeyname\fP function
++(which will then return a name beginning with "k" denoting the
++terminfo capability name rather than "K", used for curses key-names).
++On the other hand, an application can use \fBdefine_key\fP to establish
++a specific keycode for a given string.
++This makes it possible for an application to check for an extended
++capability's presence with \fItigetstr\fP,
++and reassign the keycode to match its own needs.
++.PP
++Low-level applications can use \fBtigetstr\fP to obtain the definition
++of any particular string capability.
++Higher-level applications which use the curses \fBwgetch\fP
++and similar functions to return keycodes rely upon the order in which
++the strings are loaded.
++If more than one key definition has the same string value,
++then \fBwgetch\fP can return only one keycode.
++Most curses implementations (including ncurses)
++load key definitions in the order
++defined by the array of string capability names.
++The last key to be loaded determines the keycode which will be returned.
++In ncurses, you may also have extended capabilities interpreted as
++key definitions.
++These are loaded after the predefined keys,
++and if a capability's value is the same as a previously-loaded
++key definition,
++the later definition is the one used.
+ .SH NOTES
+ Note that \fBecho\fR, \fBnoecho\fR, \fBhalfdelay\fR, \fBintrflush\fR,
+ \fBmeta\fR, \fBnodelay\fR, \fBnotimeout\fR, \fBnoqiflush\fR,
+@@ -233,4 +269,9 @@
+ respectively.  Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver
+ control states that are hard to predict or understand; it is not recommended.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_getch\fR(3X), \fBcurs_initscr\fR(3X), \fBtermio\fR(7)
++\fBcurses\fR(3X),
++\fBcurs_getch\fR(3X),
++\fBcurs_initscr\fR(3X),
++\fBcurs_util\fR(3X),
++\fBdefine_key\fR(3X),
++\fBtermio\fR(7)
 diff -Naur ncurses-5.9.orig/man/curs_termcap.3x ncurses-5.9/man/curs_termcap.3x
---- ncurses-5.9.orig/man/curs_termcap.3x        2012-02-16 18:25:12.687810779 +0000
-+++ ncurses-5.9/man/curs_termcap.3x     2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/curs_termcap.3x        2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/curs_termcap.3x     2012-08-25 19:57:59.993231475 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -30556 +36232 @@
  or zero if it is not available.
 diff -Naur ncurses-5.9.orig/man/curs_terminfo.3x ncurses-5.9/man/curs_terminfo.3x
---- ncurses-5.9.orig/man/curs_terminfo.3x       2012-02-16 18:25:12.683810673 +0000
-+++ ncurses-5.9/man/curs_terminfo.3x    2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/curs_terminfo.3x       2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/man/curs_terminfo.3x    2012-08-25 19:57:59.996564793 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -30583 +36259 @@
  .SH SEE ALSO
  \fBcurses\fR(3X),
-diff -Naur ncurses-5.9.orig/man/curs_util.3x ncurses-5.9/man/curs_util.3x
---- ncurses-5.9.orig/man/curs_util.3x   2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/curs_util.3x        2012-02-16 18:25:12.959817957 +0000
+diff -Naur ncurses-5.9.orig/man/curs_threads.3x ncurses-5.9/man/curs_threads.3x
+--- ncurses-5.9.orig/man/curs_threads.3x        2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/curs_threads.3x     2012-08-25 19:58:01.483224428 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
--.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+-.\" Copyright (c) 2008,2010 Free Software Foundation, Inc.                   *
++.\" Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
  .\"                                                                          *
  .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30597 +36273 @@
  .\"***************************************************************************
  .\"
+-.\" $Id: curs_threads.3x,v 1.18 2010/12/04 18:38:55 tom Exp $
++.\" $Id: curs_threads.3x,v 1.19 2012/05/26 17:03:26 tom Exp $
+ .TH curs_threads 3X ""
+ .de bP
+ .IP \(bu 4
+@@ -51,9 +51,9 @@
+ .br
+ \fBint set_tabsize(int size);\fR
+ .br
+-\fBint use_screen(SCREEN *scr, NCURSES_WINDOW_CB func, void *data);\fR
++\fBint use_screen(SCREEN *scr, NCURSES_SCREEN_CB func, void *data);\fR
+ .br
+-\fBint use_window(WINDOW *win, NCURSES_SCREEN_CB func, void *data);\fR
++\fBint use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data);\fR
+ .br
+ .SH DESCRIPTION
+ This implementation can be configured to provide rudimentary support
+diff -Naur ncurses-5.9.orig/man/curs_util.3x ncurses-5.9/man/curs_util.3x
+--- ncurses-5.9.orig/man/curs_util.3x   2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/man/curs_util.3x        2012-08-25 19:58:02.023221875 +0000
+@@ -1,5 +1,6 @@
++'\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
 -.\" $Id: curs_util.3x,v 1.32 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: curs_util.3x,v 1.33 2011/12/17 23:31:30 tom Exp $
++.\" $Id: curs_util.3x,v 1.36 2012/07/21 18:51:10 tom Exp $
  .TH curs_util 3X ""
  .de bP
  .IP \(bu 4
-@@ -224,7 +224,7 @@
+@@ -44,6 +45,7 @@
+ \fBputwin\fR,
+ \fBunctrl\fR,
+ \fBuse_env\fR,
++\fBuse_tioctl\fR,
+ \fBwunctrl\fR \- miscellaneous \fBcurses\fR utility routines
+ .ad
+ .hy
+@@ -64,6 +66,8 @@
+ .br
+ \fBvoid use_env(bool f);\fR
+ .br
++\fBvoid use_tioctl(bool f);\fR
++.br
+ \fBint putwin(WINDOW *win, FILE *filep);\fR
+ .br
+ \fBWINDOW *getwin(FILE *filep);\fR
+@@ -123,16 +127,70 @@
+ The limitation arises because the \fBfilter\fP routine modifies the
+ in-memory copy of the terminal information.
+ .PP
+-The \fBuse_env\fR routine, if used, is called before \fBinitscr\fR or
+-\fBnewterm\fR are called.  When called with \fBFALSE\fR as an
+-argument, the values of \fBlines\fR and \fBcolumns\fR specified in the
+-\fIterminfo\fR database will be used, even if environment variables
+-\fBLINES\fR and \fBCOLUMNS\fR (used by default) are set, or if
+-\fBcurses\fR is running in a window (in which case default behavior
+-would be to use the window size if \fBLINES\fR and \fBCOLUMNS\fR are
+-not set).
+-Note that setting \fBLINES\fR or \fBCOLUMNS\fR overrides the
+-corresponding size which may be obtained from the operating system.
++The \fBuse_env\fR routine, if used,
++should be called before \fBinitscr\fR or
++\fBnewterm\fR are called
++(because those compute the screen size).
++It modifies the way \fBncurses\fP treats environment variables
++when determining the screen size.
++.bP
++Normally ncurses looks first at the terminal database for the screen size.
++.IP
++If \fBuse_env\fP was called with \fBFALSE\fP for parameter,
++it stops here unless
++If \fBuse_tioctl\fP was also called with \fBTRUE\fP for parameter.
++.bP
++Then it asks for the screen size via operating system calls.
++If successful,
++it overrides the values from the terminal database.
++.bP
++Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
++ncurses examines the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
++using a value in those to override the results
++from the operating system or terminal database.
++.IP
++Ncurses also updates the screen size in response to SIGWINCH,
++unless overridden by the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
++.PP
++The \fBuse_tioctl\fR routine, if used,
++should be called before \fBinitscr\fR or \fBnewterm\fR are called
++(because those compute the screen size).
++After \fBuse_tioctl\fR is called with \fBTRUE\fR as an argument,
++ncurses modifies the last step in its computation of screen size as follows:
++.bP
++checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
++are set to a number greater than zero.
++.bP
++for each, ncurses updates the corresponding environment variable
++with the value that it has obtained via operating system call
++or from the terminal database.
++.bP
++ncurses re-fetches the value of the environment variables so that
++it is still the environment variables which set the screen size.
++.PP
++The \fBuse_env\fP and \fBuse_tioctl\fP routines combine as
++summarized here:
++.TS
++center tab(/);
++l l l
++_ _ _
++lw7 lw7 lw40.
++\fIuse_env\fR/\fIuse_tioctl\fR/\fISummary\fR
++TRUE/FALSE/T{
++This is the default behavior.
++ncurses uses operating system calls
++unless overridden by $LINES or $COLUMNS environment variables.
++T}
++TRUE/TRUE/T{
++ncurses updates $LINES and $COLUMNS based on operating system calls.
++T}
++FALSE/TRUE/T{
++ncurses ignores $LINES and $COLUMNS, uses operating system calls to obtain size.
++T}
++FALSE/FALSE/T{
++ncurses relies on the terminal database to determine size.
++T}
++.TE
+ .PP
+ The \fBputwin\fR routine writes all data associated with window \fIwin\fR into
+ the file to which \fIfilep\fR points.  This information can be later retrieved
+@@ -224,7 +282,7 @@
  .PP
  The \fBkeyname\fP function may return the names of user-defined
@@ -30611 +36417 @@
  user-defined strings which begin with "k".
  The keycodes start at KEY_MAX, but are not guaranteed to be 
+@@ -233,8 +291,8 @@
+ The \fBuse_extended_names\fP function controls whether this data is
+ loaded when the terminal description is read by the library.
+ .PP
+-The \fBnofilter\fP routine is specific to ncurses.
+-It was not supported on Version 7, BSD or System V implementations.
++The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to ncurses.
++They were not supported on Version 7, BSD or System V implementations.
+ It is recommended that any code depending on ncurses extensions
+ be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
 diff -Naur ncurses-5.9.orig/man/infocmp.1m ncurses-5.9/man/infocmp.1m
---- ncurses-5.9.orig/man/infocmp.1m     2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/infocmp.1m  2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/infocmp.1m     2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/man/infocmp.1m  2012-08-25 19:58:01.486557746 +0000
 @@ -1,6 +1,6 @@
  '\" t
  .\"***************************************************************************
 -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
  .\"                                                                          *
  .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30627 +36444 @@
  .\"
 -.\" $Id: infocmp.1m,v 1.46 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: infocmp.1m,v 1.50 2011/12/17 23:15:19 tom Exp $
++.\" $Id: infocmp.1m,v 1.51 2012/05/26 21:32:01 tom Exp $
  .TH @INFOCMP@ 1M ""
  .ds n 5
@@ -30644 +36461 @@
  T\
  U\
-@@ -107,6 +109,7 @@
+@@ -69,32 +71,40 @@
+ \fB@INFOCMP@\fR can be used to compare a binary \fBterminfo\fR entry with other
+ terminfo entries, rewrite a \fBterminfo\fR description to take advantage of the
+ \fBuse=\fR terminfo field, or print out a \fBterminfo\fR description from the
+-binary file (\fBterm\fR) in a variety of formats.  In all cases, the boolean
++binary file (\fBterm\fR) in a variety of formats.
++In all cases, the boolean
+ fields will be printed first, followed by the numeric fields, followed by the
+ string fields.
+ .SS Default Options
+ If no options are specified and zero or one \fItermnames\fR are specified, the
+-\fB\-I\fR option will be assumed.  If more than one \fItermname\fR is specified,
++\fB\-I\fR option will be assumed.
++If more than one \fItermname\fR is specified,
+ the \fB\-d\fR option will be assumed.
+ .SS Comparison Options [\-d] [\-c] [\-n]
+ \fB@INFOCMP@\fR compares the \fBterminfo\fR description of the first terminal
+ \fItermname\fR with each of the descriptions given by the entries for the other
+-terminal's \fItermnames\fR.  If a capability is defined for only one of the
++terminal's \fItermnames\fR.
++If a capability is defined for only one of the
+ terminals, the value returned will depend on the type of the capability:
+ \fBF\fR for boolean variables, \fB\-1\fR for integer variables, and \fBNULL\fR
+ for string variables.
+ .PP
+ The \fB\-d\fR option produces a list of each capability that is different
+-between two entries.  This option is useful to show the difference between two
++between two entries.
++This option is useful to show the difference between two
+ entries, created by different people, for the same or similar terminals.
+ .PP
+ The \fB\-c\fR option produces a list of each capability that is common between
+-two entries.  Capabilities that are not set are ignored.  This option can be
++two or more entries.
++Capabilities that are not set are ignored.
++This option can be
+ used as a quick check to see if the \fB\-u\fR option is worth using.
+ .PP
+-The \fB\-n\fR option produces a list of each capability that is in neither
+-entry.  If no \fItermnames\fR are given, the environment variable \fBTERM\fR
+-will be used for both of the \fItermnames\fR.  This can be used as a quick
++The \fB\-n\fR option produces a list of each capability that is in none of
++the given entries.
++If no \fItermnames\fR are given, the environment variable \fBTERM\fR
++will be used for both of the \fItermnames\fR.
++This can be used as a quick
+ check to see if anything was left out of a description.
+ .SS Source Listing Options [\-I] [\-L] [\-C] [\-r]
+ The \fB\-I\fR, \fB\-L\fR, and \fB\-C\fR options will produce a source listing for
+@@ -107,6 +117,7 @@
  \fB\-L\fR/use the long C variable name listed in <\fBterm.h\fR>
  \fB\-C\fR/use the \fBtermcap\fR names
@@ -30652 +36518 @@
  .PP
  If no \fItermnames\fR are given, the environment variable \fBTERM\fR will be
-@@ -128,6 +131,11 @@
- part of \fBtermcap\fR will normally be output.  Specifying the \fB\-r\fR option
+@@ -114,26 +125,38 @@
+ .PP
+ The source produced by the \fB\-C\fR option may be used directly as a
+ \fBtermcap\fR entry, but not all parameterized strings can be changed to
+-the \fBtermcap\fR format.  \fB@INFOCMP@\fR will attempt to convert most of the
++the \fBtermcap\fR format.
++\fB@INFOCMP@\fR will attempt to convert most of the
+ parameterized information, and anything not converted will be plainly marked in
+-the output and commented out.  These should be edited by hand.
++the output and commented out.
++These should be edited by hand.
+ .PP
+ All padding information for strings will be collected together and placed
+-at the beginning of the string where \fBtermcap\fR expects it.  Mandatory
++at the beginning of the string where \fBtermcap\fR expects it.
++Mandatory
+ padding (padding information with a trailing '/') will become optional.
+ .PP
+ All \fBtermcap\fR variables no longer supported by \fBterminfo\fR, but which
+-are derivable from other \fBterminfo\fR variables, will be output.  Not all
++are derivable from other \fBterminfo\fR variables, will be output.
++Not all
+ \fBterminfo\fR capabilities will be translated; only those variables which were
+-part of \fBtermcap\fR will normally be output.  Specifying the \fB\-r\fR option
++part of \fBtermcap\fR will normally be output.
++Specifying the \fB\-r\fR option
  will take off this restriction, allowing all capabilities to be output in
  \fItermcap\fR form.
@@ -30663 +36553 @@
  .PP
  Note that because padding is collected to the beginning of the capability, not
- all capabilities are output.  Mandatory padding is not supported.  Because
-@@ -173,7 +181,7 @@
+-all capabilities are output.  Mandatory padding is not supported.  Because
++all capabilities are output.
++Mandatory padding is not supported.
++Because
+ \fBtermcap\fR strings are not as flexible, it is not always possible to convert
+-a \fBterminfo\fR string capability into an equivalent \fBtermcap\fR format.  A
+-subsequent conversion of the \fBtermcap\fR file back into \fBterminfo\fR format
++a \fBterminfo\fR string capability into an equivalent \fBtermcap\fR format.
++A subsequent conversion of the \fBtermcap\fR file back into \fBterminfo\fR format
+ will not necessarily reproduce the original \fBterminfo\fR
+ source.
+ .PP
+@@ -156,27 +179,33 @@
+ .SS Use= Option [\-u]
+ The \fB\-u\fR option produces a \fBterminfo\fR source description of the first
+ terminal \fItermname\fR which is relative to the sum of the descriptions given
+-by the entries for the other terminals \fItermnames\fR.  It does this by
++by the entries for the other terminals \fItermnames\fR.
++It does this by
+ analyzing the differences between the first \fItermname\fR and the other
+ \fItermnames\fR and producing a description with \fBuse=\fR fields for the
+-other terminals.  In this manner, it is possible to retrofit generic terminfo
+-entries into a terminal's description.  Or, if two similar terminals exist, but
++other terminals.
++In this manner, it is possible to retrofit generic terminfo
++entries into a terminal's description.
++Or, if two similar terminals exist, but
+ were coded at different times or by different people so that each description
+ is a full description, using \fB@INFOCMP@\fR will show what can be done to change
+ one description to be relative to the other.
+ .PP
+ A capability will get printed with an at-sign (@) if it no longer exists in the
+ first \fItermname\fR, but one of the other \fItermname\fR entries contains a
+-value for it.  A capability's value gets printed if the value in the first
++value for it.
++A capability's value gets printed if the value in the first
+ \fItermname\fR is not found in any of the other \fItermname\fR entries, or if
+ the first of the other \fItermname\fR entries that has this capability gives a
  different value for the capability than that in the first \fItermname\fR.
  .PP
- The order of the other \fItermname\fR entries is significant.  Since the
+-The order of the other \fItermname\fR entries is significant.  Since the
 -terminfo compiler \fBtic\fR does a left-to-right scan of the capabilities,
++The order of the other \fItermname\fR entries is significant.
++Since the
 +terminfo compiler \fB@TIC@\fR does a left-to-right scan of the capabilities,
  specifying two \fBuse=\fR entries that contain differing entries for the same
  capabilities will produce different results depending on the order that the
- entries are given in.  \fB@INFOCMP@\fR will flag any such inconsistencies between
-@@ -202,6 +210,9 @@
+-entries are given in.  \fB@INFOCMP@\fR will flag any such inconsistencies between
++entries are given in.
++\fB@INFOCMP@\fR will flag any such inconsistencies between
+ the other \fItermname\fR entries as they are found.
+ .PP
+ Alternatively, specifying a capability \fIafter\fR a \fBuse=\fR entry that
+@@ -187,29 +216,43 @@
+ .PP
+ Another error that does not cause incorrect compiled files, but will slow down
+ the compilation time, is specifying extra \fBuse=\fR fields that are
+-superfluous.  \fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that
++superfluous.
++\fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that
+ were not needed.
+ .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
+ The location of the compiled \fBterminfo\fR database is taken from the
+-environment variable \fBTERMINFO\fR .  If the variable is not defined, or the
++environment variable \fBTERMINFO\fR\ .
++If the variable is not defined, or the
+ terminal is not found in that location, the system \fBterminfo\fR database,
+-in \fB@TERMINFO@\fR, will be used.  The options \fB\-A\fR
+-and \fB\-B\fR may be used to override this location.  The \fB\-A\fR option will
++in \fB@TERMINFO@\fR, will be used.
++The options \fB\-A\fR
++and \fB\-B\fR may be used to override this location.
++The \fB\-A\fR option will
+ set \fBTERMINFO\fR for the first \fItermname\fR and the \fB\-B\fR option will
+-set \fBTERMINFO\fR for the other \fItermnames\fR.  With this, it is possible to
++set \fBTERMINFO\fR for the other \fItermnames\fR.
++With this, it is possible to
+ compare descriptions for a terminal with the same name located in two different
+-databases.  This is useful for comparing descriptions for the same terminal
++databases.
++This is useful for comparing descriptions for the same terminal
  created by different people.
  .SS Other Options
@@ -30681 +36641 @@
 +.TP 5
  \fB\-1\fR
- causes the fields to be printed out one to a line.  Otherwise,
+-causes the fields to be printed out one to a line.  Otherwise,
++causes the fields to be printed out one to a line.
++Otherwise,
  the fields will be printed several to a line to a maximum width
-@@ -210,6 +221,9 @@
+ of 60 characters.
+ .TP
  \fB\-a\fR
  tells \fB@INFOCMP@\fP to retain commented-out capabilities rather than discarding
- them.  Capabilities are commented by prefixing them with a period.
+-them.  Capabilities are commented by prefixing them with a period.
++them.
++Capabilities are commented by prefixing them with a period.
 +.TP
 +\fB\-D\fR
@@ -30693 +36658 @@
  \fB\-E\fR
  Dump the capabilities of the given terminal as tables, needed in
-@@ -362,7 +376,7 @@
+@@ -231,12 +274,15 @@
+ for a given terminal type.
+ .TP 5
+ \fB\-F\fR
+-compare terminfo files.  This assumes that two following arguments are
+-filenames.  The files are searched for pairwise matches between
++compare terminfo files.
++This assumes that two following arguments are filenames.
++The files are searched for pairwise matches between
+ entries, with two entries considered to match if any of their names do.
+ The report printed to standard output lists entries with no matches in
+-the other file, and entries with more than one match.  For entries
+-with exactly one match it includes a difference report.  Normally,
++the other file, and entries with more than one match.
++For entries
++with exactly one match it includes a difference report.
++Normally,
+ to reduce the volume of the report, use references are
+ not resolved before looking for differences, but resolution can be forced
+ by also specifying \fB\-r\fR.
+@@ -255,14 +301,17 @@
+ .TP 5
+ \fB\-i\fR
+ Analyze the initialization (\fBis1\fR, \fBis2\fR, \fBis3\fR), and reset
+-(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR), strings in the entry.  For each string, the
++(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR), strings in the entry.
++For each string, the
+ code tries to analyze it into actions in terms of the other capabilities in the
+ entry, certain X3.64/ISO 6429/ECMA\-48 capabilities, and certain DEC VT-series
+ private modes (the set of recognized special sequences has been selected for
+-completeness over the existing terminfo database).  Each report line consists
++completeness over the existing terminfo database).
++Each report line consists
+ of the capability name, followed by a colon and space, followed by a printable
+ expansion of the capability string with sections matching recognized actions
+-translated into {}-bracketed descriptions.  Here is a list of the DEC/ANSI
++translated into {}-bracketed descriptions.
++Here is a list of the DEC/ANSI
+ special sequences recognized:
+ i.
+ .TS
+@@ -308,7 +357,8 @@
+ .sp
+ It also recognizes a SGR action corresponding to ANSI/ISO 6429/ECMA Set
+ Graphics Rendition, with the values NORMAL, BOLD, UNDERLINE, BLINK, and
+-REVERSE.  All but NORMAL may be prefixed with `+' (turn on) or `\-' (turn off).
++REVERSE.
++All but NORMAL may be prefixed with `+' (turn on) or `\-' (turn off).
+ .PP
+ An SGR0 designates an empty highlight sequence (equivalent to {SGR:NORMAL}).
+ .TP 5
+@@ -323,12 +373,15 @@
+ "\-" for absent capabilities, "@" for canceled rather than "NULL".
+ .TP 5
+ \fB\-R\fR\fIsubset\fR
+-Restrict output to a given subset.  This option is for use with archaic
++Restrict output to a given subset.
++This option is for use with archaic
+ versions of terminfo like those on SVr1, Ultrix, or HP/UX that do not support
+ the full set of SVR4/XSI Curses terminfo; and variants such as AIX
+-that have their own extensions incompatible with SVr4/XSI.  Available terminfo
++that have their own extensions incompatible with SVr4/XSI.
++Available terminfo
+ subsets are "SVr1", "Ultrix", "HP", and "AIX"; see \fBterminfo\fR(\*n) for
+-details.  You can also choose the subset "BSD" which selects only capabilities
++details.
++You can also choose the subset "BSD" which selects only capabilities
+ with termcap equivalents recognized by 4.4BSD.
+ .TP
+ \fB\-s \fR\fI[d|i|l|c]\fR
+@@ -362,7 +415,7 @@
  descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo).
  .TP
@@ -30702 +36737 @@
  untranslatable capabilities are commented-out.
  .TP 5
-@@ -385,13 +399,15 @@
+@@ -385,13 +438,15 @@
  \fB\-x\fR
  print information for user-defined capabilities.
@@ -30719 +36754 @@
  \fB\-F\fR,
  \fB\-G\fR,
+@@ -410,7 +465,8 @@
+ options are not supported in SVr4 curses.
+ .PP
+ The \fB\-r\fR option's notion of `termcap' capabilities is System V Release 4's.
+-Actual BSD curses versions will have a more restricted set.  To see only the
++Actual BSD curses versions will have a more restricted set.
++To see only the
+ 4.4BSD set, use \fB\-r\fR \fB\-RBSD\fR.
+ .SH BUGS
+ The \fB\-F\fR option of \fB@INFOCMP@\fR(1M) should be a \fB@TOE@\fR(1M) mode.
 diff -Naur ncurses-5.9.orig/man/ncurses.3x ncurses-5.9/man/ncurses.3x
---- ncurses-5.9.orig/man/ncurses.3x     2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/ncurses.3x  2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/ncurses.3x     2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/ncurses.3x  2012-08-25 19:58:01.936555619 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
 @@ -27,7 +27,7 @@
  .\" authorization.                                                           *
@@ -30727 +36780 @@
  .\"
 -.\" $Id: ncurses.3x,v 1.103 2011/02/05 23:21:29 tom Exp $
-+.\" $Id: ncurses.3x,v 1.106 2011/12/17 23:19:59 tom Exp $
++.\" $Id: ncurses.3x,v 1.107 2012/07/14 21:13:06 tom Exp $
  .hy 0
  .TH ncurses 3X ""
@@ -30743 +36796 @@
  .PP
  The \fBncurses\fR library permits manipulation of data structures,
-@@ -734,6 +734,9 @@
+@@ -637,6 +637,7 @@
+ use_env/\fBcurs_util\fR(3X)
+ use_extended_names/\fBcurs_extend\fR(3X)*
+ use_legacy_coding/\fBlegacy_coding\fR(3X)*
++use_tioctl/\fBcurs_util\fR(3X)
+ vid_attr/\fBcurs_terminfo\fR(3X)
+ vid_puts/\fBcurs_terminfo\fR(3X)
+ vidattr/\fBcurs_terminfo\fR(3X)
+@@ -734,6 +735,9 @@
  integer value other than \fBERR\fR upon successful completion, unless
  otherwise noted in the routine descriptions.
@@ -30753 +36814 @@
  \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.
  The return values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and
-@@ -933,7 +936,7 @@
+@@ -786,7 +790,9 @@
+ a terminal description for terminals which are run as emulations.
+ .IP
+ Use the \fBuse_env\fR function to disable all use of external environment
+-(including system calls) to determine the screen size.
++(but not including system calls) to determine the screen size.
++Use the \fBuse_tioctl\fR function to update \fBCOLUMNS\fP or \fBLINES\fP
++to match the screen size obtained from system calls or the terminal database.
+ .TP 5
+ ESCDELAY
+ Specifies the total time, in milliseconds, for which ncurses will
+@@ -933,7 +939,7 @@
  .IP
  As an alternative to the environment variable,
@@ -30762 +36834 @@
  .RS 5
  .sp
-@@ -1004,6 +1007,13 @@
+@@ -1004,6 +1010,13 @@
  The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
  All of the terminal descriptions are in terminfo form, which makes
@@ -30776 +36848 @@
  TERMPATH
  If TERMCAP does not hold a file name then \fBncurses\fR checks
-@@ -1144,6 +1154,15 @@
+@@ -1144,6 +1157,15 @@
  the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR
  sections of the library man pages.
@@ -30792 +36864 @@
  .bP
  The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.
+diff -Naur ncurses-5.9.orig/man/resizeterm.3x ncurses-5.9/man/resizeterm.3x
+--- ncurses-5.9.orig/man/resizeterm.3x  2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/resizeterm.3x       2012-08-25 19:58:01.893222491 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -28,7 +28,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-2005
+ .\"
+-.\" $Id: resizeterm.3x,v 1.14 2010/12/04 18:38:55 tom Exp $
++.\" $Id: resizeterm.3x,v 1.15 2012/07/07 18:38:21 tom Exp $
+ .TH resizeterm 3X ""
+ .SH NAME
+ \fBis_term_resized\fR,
+@@ -86,8 +86,6 @@
+ the operating system.
+ Thus, even if a SIGWINCH is received,
+ no screen size change may be recorded.
+-In that case, no \fBKEY_RESIZE\fP is queued for the next call to \fBgetch\fP;
+-an \fBERR\fP will be returned instead.
+ .SH SEE ALSO
+ \fBcurs_variables\fR(3X),
+ \fBwresize\fR(3X).
 diff -Naur ncurses-5.9.orig/man/tabs.1 ncurses-5.9/man/tabs.1
---- ncurses-5.9.orig/man/tabs.1 2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/tabs.1      2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/tabs.1 2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/man/tabs.1      2012-08-25 19:57:59.999898111 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -30852 +36952 @@
  .SS Implicit Lists
 diff -Naur ncurses-5.9.orig/man/term.7 ncurses-5.9/man/term.7
---- ncurses-5.9.orig/man/term.7 2012-02-16 18:25:12.683810673 +0000
-+++ ncurses-5.9/man/term.7      2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/term.7 2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/man/term.7      2012-08-25 19:57:59.999898111 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -30880 +36980 @@
  .PP
 diff -Naur ncurses-5.9.orig/man/term_variables.3x ncurses-5.9/man/term_variables.3x
---- ncurses-5.9.orig/man/term_variables.3x      2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/term_variables.3x   2012-02-16 18:25:12.959817957 +0000
+--- ncurses-5.9.orig/man/term_variables.3x      2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/term_variables.3x   2012-08-25 19:57:59.999898111 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -30907 +37007 @@
  as well as the corresponding names for termcap capabilities.
  These are available to other applications,
+diff -Naur ncurses-5.9.orig/man/terminfo.head ncurses-5.9/man/terminfo.head
+--- ncurses-5.9.orig/man/terminfo.head  2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/terminfo.head       2012-08-25 19:58:00.956560253 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,10 +26,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.head,v 1.18 2010/07/31 16:08:48 tom Exp $
++.\" $Id: terminfo.head,v 1.19 2012/03/01 09:51:23 tom Exp $
+ .TH terminfo 5 "" "" "File Formats"
+ .ds n 5
+ .ds d @TERMINFO@
++.de bP
++.IP \(bu 4
++..
+ .SH NAME
+ terminfo \- terminal capability data base
+ .SH SYNOPSIS
 diff -Naur ncurses-5.9.orig/man/terminfo.tail ncurses-5.9/man/terminfo.tail
---- ncurses-5.9.orig/man/terminfo.tail  2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/terminfo.tail       2012-02-16 18:25:12.963818063 +0000
+--- ncurses-5.9.orig/man/terminfo.tail  2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/man/terminfo.tail       2012-08-25 19:58:00.956560253 +0000
 @@ -1,4 +1,4 @@
 -.\" $Id: terminfo.tail,v 1.53 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: terminfo.tail,v 1.55 2011/12/17 23:19:59 tom Exp $
++.\" $Id: terminfo.tail,v 1.57 2012/03/01 12:02:54 tom Exp $
  .\" Beginning of terminfo.tail file
  .\" This file is part of ncurses.
  .\" See "terminfo.head" for copyright.
-@@ -125,8 +125,8 @@
+@@ -75,14 +75,29 @@
+ \fB^x\fR maps to a control-x for any appropriate x, and the sequences
+ \fB\en \el \er \et \eb \ef \es\fR give
+ a newline, line-feed, return, tab, backspace, form-feed, and space.
+-Other escapes include \fB\e^\fR for \fB^\fR,
++Other escapes include
++.bP
++\fB\e^\fR for \fB^\fR,
++.bP
+ \fB\e\e\fR for \fB\e\fR,
++.bP
+ \fB\e\fR, for comma,
++.bP
+ \fB\e:\fR for \fB:\fR,
++.bP
+ and \fB\e0\fR for null.
+-(\fB\e0\fR will produce \e200, which does not terminate a string but behaves
++.IP
++\fB\e0\fR will produce \e200, which does not terminate a string but behaves
+ as a null character on most terminals, providing CS7 is specified.
+-See stty(1).)
++See stty(1).
++.IP
++The reason for this quirk is to maintain binary compatibility of the
++compiled terminfo files with other implementations,
++e.g., the SVr4 systems, which document this.
++Compiled terminfo files use null-terminated strings, with no lengths.
++Modifying this would require a new binary format, 
++which would not work with other implementations.
++.PP
+ Finally, characters may be given as three octal digits after a \fB\e\fR.
+ .PP
+ A delay in milliseconds may appear anywhere in a string capability, enclosed in
+@@ -125,8 +140,8 @@
  for a compiled description.
  If it fails to find one there, and the environment variable TERMINFO_DIRS is
@@ -30927 +37085 @@
  TERMINFO_DIRS directories, the fetch fails.
  .PP
-@@ -397,7 +397,7 @@
+@@ -397,7 +412,7 @@
  .IP
  where c\di\u are conditions, b\di\u are bodies.
@@ -30936 +37094 @@
  Some strings, e.g., \fBsgr\fP can be very complicated when written
  on one line.
-@@ -974,7 +974,7 @@
+@@ -593,6 +608,7 @@
+ a distinction between typed and untyped blanks on the screen, shifting
+ upon an insert or delete only to an untyped blank on the screen which is
+ either eliminated, or expanded to two untyped blanks.
++.PP
+ You can determine the
+ kind of terminal you have by clearing the screen and then typing
+ text separated by cursor motions.
+@@ -608,6 +624,7 @@
+ current line and onto the next as you insert, you have the second type of
+ terminal, and should give the capability \fBin\fR, which stands for
+ \*(lqinsert null\*(rq.
++.PP
+ While these are two logically separate attributes (one line versus multi-line
+ insert mode, and special treatment of untyped spaces) we have seen no
+ terminals whose insert mode cannot be described with the single attribute.
+@@ -974,7 +991,7 @@
  .B it
  is given, showing the number of spaces the tabs are set to.
@@ -30945 +37119 @@
  and whether to set the tab stops.
  If the terminal has tab stops that can be saved in non-volatile memory,
+@@ -1570,19 +1587,15 @@
+ backslash-newline pairs, which \fBtgetent()\fP strips out while reading it.
+ Some termcap libraries strip off the final newline, too (GNU termcap does not).
+ Now suppose:
+-.TP 5
+-*
++.bP
+ a termcap entry before expansion is more than 1023 bytes long,
+-.TP 5
+-*
++.bP
+ and the application has only allocated a 1k buffer,
+-.TP 5
+-*
++.bP
+ and the termcap library (like the one in BSD/OS 1.1 and GNU) reads
+ the whole entry into the buffer, no matter what its length, to see
+ if it is the entry it wants,
+-.TP 5
+-*
++.bP
+ and \fBtgetent()\fP is searching for a terminal type that either is the
+ long entry, appears in the termcap file after the long entry, or
+ does not appear in the file at all (so that \fBtgetent()\fP has to search
 diff -Naur ncurses-5.9.orig/man/tic.1m ncurses-5.9/man/tic.1m
---- ncurses-5.9.orig/man/tic.1m 2012-02-16 18:25:12.683810673 +0000
-+++ ncurses-5.9/man/tic.1m      2012-02-16 18:25:13.239825345 +0000
+--- ncurses-5.9.orig/man/tic.1m 2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/tic.1m      2012-08-25 19:58:01.059893097 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -30960 +37158 @@
  .\"
 -.\" $Id: tic.1m,v 1.47 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: tic.1m,v 1.54 2012/02/04 23:09:43 tom Exp $
++.\" $Id: tic.1m,v 1.55 2012/03/24 21:21:05 tom Exp $
  .TH @TIC@ 1M ""
  .ds n 5
@@ -31150 +37348 @@
  or in termcaps.
  .TP
-@@ -200,7 +259,7 @@
+@@ -200,31 +259,13 @@
  .TP
  \fB\-v\fR\fIn\fR
@@ -31159 +37357 @@
  indicating the desired level of detail of information.
  If \fIn\fR is omitted, the default level is 1.
-@@ -214,11 +273,12 @@
+ If \fIn\fR is specified and greater than 1, the level of
+ detail is increased.
+-.TP
+-\fB\-w\fR\fIn\fR
+-specifies the width of the output.
+-The parameter is optional.
+-If it is omitted, it defaults to 60.
+-.TP
+-\fB\-x\fR
+-Treat unknown capabilities as user-defined.
+-That is, if you supply a capability name which \fBtic\fP does not recognize,
+-it will infer its type (boolean, number or string) from the syntax and
+-make an extended table entry for that.
+-User-defined capability strings
+-whose name begins with ``k'' are treated as function keys.
+-.TP
+-\fIfile\fR
+-contains one or more \fBterminfo\fR terminal descriptions in source
+-format [see \fBterminfo\fR(\*n)].
+-Each description in the file
+-describes the capabilities of a particular terminal.
++.RS
+ .PP
+ The debug flag levels are as follows:
  .TP
- \fB\-x\fR
- Treat unknown capabilities as user-defined.
--That is, if you supply a capability name which \fBtic\fP does not recognize,
-+That is, if you supply a capability name which \fB@TIC@\fP does not recognize,
- it will infer its type (boolean, number or string) from the syntax and
- make an extended table entry for that.
- User-defined capability strings
- whose name begins with ``k'' are treated as function keys.
-+.SS PARAMETERS
- .TP
- \fIfile\fR
- contains one or more \fBterminfo\fR terminal descriptions in source
-@@ -250,19 +310,20 @@
+@@ -250,19 +291,44 @@
  All values computed in construction of the hash table
  .LP
  If the debug level \fIn\fR is not given, it is taken to be one.
++.RE
++.TP
++\fB\-w\fR\fIn\fR
++specifies the width of the output.
++The parameter is optional.
++If it is omitted, it defaults to 60.
++.TP
++\fB\-x\fR
++Treat unknown capabilities as user-defined.
++That is, if you supply a capability name which \fB@TIC@\fP does not recognize,
++it will infer its type (boolean, number or string) from the syntax and
++make an extended table entry for that.
++User-defined capability strings
++whose name begins with ``k'' are treated as function keys.
++.SS PARAMETERS
++.TP
++\fIfile\fR
++contains one or more \fBterminfo\fR terminal descriptions in source
++format [see \fBterminfo\fR(\*n)].
++Each description in the file
++describes the capabilities of a particular terminal.
++.IP
++If \fIfile\fR is ``-'', then the data is read from the standard input.
++The \fIfile\fR parameter may also be the path of a character-device.
 +.SS PROCESSING
  .PP
@@ -31198 +37431 @@
  those capabilities that explicitly are defined in the current entry.
  .PP
-@@ -272,9 +333,6 @@
+@@ -272,9 +338,6 @@
  \fBentry_name_1\fR before \fBuse=\fR for these capabilities to be
  canceled in \fBentry_name_1\fR.
@@ -31208 +37441 @@
  The name field cannot
  exceed 512 bytes.
-@@ -282,14 +340,14 @@
+@@ -282,14 +345,14 @@
  (32 characters on systems with long filenames, 14 characters otherwise)
  will be truncated to the maximum alias length and a warning message will be printed.
@@ -31226 +37459 @@
  In fact, entries in terminfo and termcap syntax can
  be mixed in a single source file.
-@@ -298,16 +356,20 @@
+@@ -298,16 +361,20 @@
  .PP
  The SVr4 manual pages are not clear on the resolution rules for \fBuse\fR
@@ -31251 +37484 @@
  \fB\-G\fR,
  \fB\-I\fR,
-@@ -329,7 +391,7 @@
+@@ -329,7 +396,7 @@
  The SVr4 \fB\-c\fR mode does not report bad use links.
  .PP
@@ -31260 +37493 @@
  .TP 5
  \fB\*d/?/*\fR
-@@ -340,6 +402,7 @@
+@@ -340,6 +407,7 @@
  \fB@INFOTOCAP@\fR(1M),
  \fB@TOE@\fR(1M),
@@ -31269 +37502 @@
  This describes \fBncurses\fR
 diff -Naur ncurses-5.9.orig/man/toe.1m ncurses-5.9/man/toe.1m
---- ncurses-5.9.orig/man/toe.1m 2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/man/toe.1m      2012-02-16 18:25:13.059820594 +0000
+--- ncurses-5.9.orig/man/toe.1m 2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/man/toe.1m      2012-08-25 19:58:00.176563939 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -31328 +37561 @@
  .TP
 diff -Naur ncurses-5.9.orig/man/tput.1 ncurses-5.9/man/tput.1
---- ncurses-5.9.orig/man/tput.1 2012-02-16 18:25:12.683810673 +0000
-+++ ncurses-5.9/man/tput.1      2012-02-16 18:25:12.963818063 +0000
+--- ncurses-5.9.orig/man/tput.1 2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/tput.1      2012-08-25 19:58:01.936555619 +0000
 @@ -1,6 +1,6 @@
  '\" t
  .\"***************************************************************************
 -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
  .\"                                                                          *
  .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31343 +37576 @@
  .\"
 -.\" $Id: tput.1,v 1.29 2010/12/04 18:41:07 tom Exp $
-+.\" $Id: tput.1,v 1.31 2011/12/25 01:37:53 tom Exp $
++.\" $Id: tput.1,v 1.32 2012/07/14 21:06:45 tom Exp $
  .TH @TPUT@ 1 ""
  .ds d @TERMINFO@
  .ds n 1
-@@ -159,7 +159,7 @@
+@@ -77,11 +77,12 @@
+ and the \fIcapname\fR associated with each, see \fBterminfo\fR(5).
+ .TP
+ \fB\-T\fR\fItype\fR
+-indicates the \fItype\fR of terminal.  Normally this option is
++indicates the \fItype\fR of terminal.
++Normally this option is
+ unnecessary, because the default is taken from the environment
+-variable \fBTERM\fR.  If \fB\-T\fR is specified, then the shell
+-variables \fBLINES\fR and \fBCOLUMNS\fR will be ignored,and the
+-operating system will not be queried for the actual screen size.
++variable \fBTERM\fR.
++If \fB\-T\fR is specified, then the shell
++variables \fBLINES\fR and \fBCOLUMNS\fR will also be ignored.
+ .TP
+ \fIcapname\fR
+ indicates the capability from the \fBterminfo\fR database.  When
+@@ -159,7 +160,7 @@
  .PP
  If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the
@@ -31356 +37606 @@
  .TP 5
  \fB@TPUT@ init\fR
-@@ -275,7 +275,7 @@
+@@ -275,7 +276,7 @@
  .PP
  Any other exit code indicates an error; see the DIAGNOSTICS section.
@@ -31365 +37615 @@
  .PP
  .ne 15
-@@ -303,17 +303,29 @@
+@@ -303,17 +304,29 @@
  .PP
  X/Open documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
@@ -31399 +37649 @@
  version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 diff -Naur ncurses-5.9.orig/man/tset.1 ncurses-5.9/man/tset.1
---- ncurses-5.9.orig/man/tset.1 2012-02-16 18:25:12.683810673 +0000
-+++ ncurses-5.9/man/tset.1      2012-02-16 18:25:12.963818063 +0000
+--- ncurses-5.9.orig/man/tset.1 2012-08-25 19:57:59.389900995 +0000
++++ ncurses-5.9/man/tset.1      2012-08-25 19:58:00.003231428 +0000
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -31536 +37786 @@
  .TP 5
 diff -Naur ncurses-5.9.orig/menu/Makefile.in ncurses-5.9/menu/Makefile.in
---- ncurses-5.9.orig/menu/Makefile.in   2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/menu/Makefile.in        2012-02-16 18:25:12.963818063 +0000
+--- ncurses-5.9.orig/menu/Makefile.in   2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/Makefile.in        2012-08-25 19:58:00.003231428 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.54 2010/11/27 21:45:27 tom Exp $
@@ -31555 +37805 @@
  
  NCURSES_MAJOR  = @NCURSES_MAJOR@
-diff -Naur ncurses-5.9.orig/menu/m_driver.c ncurses-5.9/menu/m_driver.c
---- ncurses-5.9.orig/menu/m_driver.c    2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/menu/m_driver.c 2012-02-16 18:25:12.963818063 +0000
+diff -Naur ncurses-5.9.orig/menu/m_attribs.c ncurses-5.9/menu/m_attribs.c
+--- ncurses-5.9.orig/menu/m_attribs.c   2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_attribs.c        2012-08-25 19:58:00.979893475 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31569 +37819 @@
  #include "menu.priv.h"
  
+-MODULE_ID("$Id: m_attribs.c,v 1.16 2010/01/23 21:16:54 tom Exp $")
++MODULE_ID("$Id: m_attribs.c,v 1.17 2012/03/10 23:43:41 tom Exp $")
+ 
+ /* Macro to redraw menu if it is posted and changed */
+ #define Refresh_Menu(menu) \
+@@ -51,7 +51,7 @@
+ #define GEN_MENU_ATTR_SET_FCT( name ) \
+ NCURSES_IMPEXP int NCURSES_API set_menu_ ## name (MENU* menu, chtype attr) \
+ {\
+-  T((T_CALLED("set_menu_" #name "(%p,%s)"), menu, _traceattr(attr))); \
++  T((T_CALLED("set_menu_" #name "(%p,%s)"), (void *) menu, _traceattr(attr))); \
+    if (!(attr==A_NORMAL || (attr & A_ATTRIBUTES)==attr))\
+       RETURN(E_BAD_ARGUMENT);\
+    if (menu && ( menu -> name != attr))\
+diff -Naur ncurses-5.9.orig/menu/m_driver.c ncurses-5.9/menu/m_driver.c
+--- ncurses-5.9.orig/menu/m_driver.c    2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_driver.c 2012-08-25 19:58:00.983226792 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
 -MODULE_ID("$Id: m_driver.c,v 1.29 2010/01/23 21:20:10 tom Exp $")
-+MODULE_ID("$Id: m_driver.c,v 1.30 2011/05/21 18:56:41 tom Exp $")
++MODULE_ID("$Id: m_driver.c,v 1.31 2012/03/10 23:43:41 tom Exp $")
  
  /* Macros */
  
+@@ -47,7 +47,7 @@
+ 
+ /* Add a new character to the match pattern buffer */
+ #define Add_Character_To_Pattern(menu,ch) \
+-  { (menu)->pattern[((menu)->pindex)++] = (ch);\
++  { (menu)->pattern[((menu)->pindex)++] = (char) (ch);\
+     (menu)->pattern[(menu)->pindex] = '\0'; }
+ 
+ /*---------------------------------------------------------------------------
 @@ -537,7 +537,11 @@
         result = E_UNKNOWN_COMMAND;
@@ -31587 +37874 @@
        /* Adjust the top row if it turns out that the current item unfortunately
           doesn't appear in the menu window */
+diff -Naur ncurses-5.9.orig/menu/m_format.c ncurses-5.9/menu/m_format.c
+--- ncurses-5.9.orig/menu/m_format.c    2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_format.c 2012-08-25 19:58:01.719889976 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_format.c,v 1.16 2010/01/23 21:20:10 tom Exp $")
++MODULE_ID("$Id: m_format.c,v 1.18 2012/06/09 23:54:02 tom Exp $")
+ 
+ #define minimum(a,b) ((a)<(b) ? (a): (b))
+ 
+@@ -81,8 +81,8 @@
+       if (menu->pattern)
+        Reset_Pattern(menu);
+ 
+-      menu->frows = rows;
+-      menu->fcols = cols;
++      menu->frows = (short)rows;
++      menu->fcols = (short)cols;
+ 
+       assert(rows > 0 && cols > 0);
+       total_rows = (menu->nitems - 1) / cols + 1;
+@@ -90,21 +90,21 @@
+        minimum(menu->nitems, cols) :
+        (menu->nitems - 1) / total_rows + 1;
+ 
+-      menu->rows = total_rows;
+-      menu->cols = total_cols;
+-      menu->arows = minimum(total_rows, rows);
++      menu->rows = (short)total_rows;
++      menu->cols = (short)total_cols;
++      menu->arows = (short)minimum(total_rows, rows);
+       menu->toprow = 0;
+       menu->curitem = *(menu->items);
+       assert(menu->curitem);
+-      menu->status |= _LINK_NEEDED;
++      SetStatus(menu, _LINK_NEEDED);
+       _nc_Calculate_Item_Length_and_Width(menu);
+     }
+   else
+     {
+       if (rows > 0)
+-       _nc_Default_Menu.frows = rows;
++       _nc_Default_Menu.frows = (short)rows;
+       if (cols > 0)
+-       _nc_Default_Menu.fcols = cols;
++       _nc_Default_Menu.fcols = (short)cols;
+     }
+ 
+   RETURN(E_OK);
+diff -Naur ncurses-5.9.orig/menu/m_global.c ncurses-5.9/menu/m_global.c
+--- ncurses-5.9.orig/menu/m_global.c    2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_global.c 2012-08-25 19:58:01.719889976 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_global.c,v 1.25 2010/01/23 21:20:10 tom Exp $")
++MODULE_ID("$Id: m_global.c,v 1.27 2012/06/10 00:09:15 tom Exp $")
+ 
+ static char mark[] = "-";
+ /* *INDENT-OFF* */
+@@ -117,17 +117,17 @@
+   assert(menu && menu->items);
+   for (items = menu->items; *items; items++)
+     {
+-      check = _nc_Calculate_Text_Width(&((*items)->name));
++      check = (unsigned)_nc_Calculate_Text_Width(&((*items)->name));
+       if (check > MaximumNameLength)
+        MaximumNameLength = check;
+ 
+-      check = _nc_Calculate_Text_Width(&((*items)->description));
++      check = (unsigned)_nc_Calculate_Text_Width(&((*items)->description));
+       if (check > MaximumDescriptionLength)
+        MaximumDescriptionLength = check;
+     }
+ 
+-  menu->namelen = MaximumNameLength;
+-  menu->desclen = MaximumDescriptionLength;
++  menu->namelen = (short)MaximumNameLength;
++  menu->desclen = (short)MaximumDescriptionLength;
+   T(("ComputeMaximum_NameDesc_Lengths %d,%d", menu->namelen, menu->desclen));
+ }
+ 
+@@ -195,7 +195,7 @@
+                {
+                  (*item)->value = FALSE;
+                }
+-             (*item)->index = ItemCount++;
++             (*item)->index = (short)ItemCount++;
+              (*item)->imenu = menu;
+            }
+        }
+@@ -206,7 +206,7 @@
+   if (ItemCount != 0)
+     {
+       menu->items = items;
+-      menu->nitems = ItemCount;
++      menu->nitems = (short)ItemCount;
+       ComputeMaximum_NameDesc_Lengths(menu);
+       if ((menu->pattern = typeMalloc(char, (unsigned)(1 + menu->namelen))))
+        {
+@@ -256,7 +256,7 @@
+   T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item));
+   if (result != 0 && item->str != 0)
+     {
+-      int count = mbstowcs(0, item->str, 0);
++      int count = (int)mbstowcs(0, item->str, 0);
+       wchar_t *temp = 0;
+ 
+       if (count > 0
+@@ -343,7 +343,7 @@
+ 
+   assert(menu);
+ 
+-  menu->height = 1 + menu->spc_rows * (menu->arows - 1);
++  menu->height = (short)(1 + menu->spc_rows * (menu->arows - 1));
+ 
+   l = calculate_actual_width(menu, TRUE);
+   l += menu->marklen;
+@@ -354,10 +354,10 @@
+       l += menu->spc_desc;
+     }
+ 
+-  menu->itemlen = l;
++  menu->itemlen = (short)l;
+   l *= menu->cols;
+   l += (menu->cols - 1) * menu->spc_cols;      /* for the padding between the columns */
+-  menu->width = l;
++  menu->width = (short)l;
+ 
+   T(("_nc_CalculateItem_Length_and_Width columns %d, item %d, width %d",
+      menu->cols,
+@@ -388,7 +388,7 @@
+       int Last_in_Column;
+       bool cycle = (menu->opt & O_NONCYCLIC) ? FALSE : TRUE;
+ 
+-      menu->status &= ~_LINK_NEEDED;
++      ClrStatus(menu, _LINK_NEEDED);
+ 
+       if (menu->opt & O_ROWMAJOR)
+        {
+@@ -431,8 +431,8 @@
+                (cycle ? menu->items[(row + 1) < menu->rows ?
+                                     Number_Of_Items - 1 : col] :
+                 (ITEM *) 0);
+-             item->x = col;
+-             item->y = row;
++             item->x = (short)col;
++             item->y = (short)row;
+              if (++col == Number_Of_Columns)
+                {
+                  row++;
+@@ -482,8 +482,8 @@
+                 (ITEM *) 0
+                );
+ 
+-             item->x = col;
+-             item->y = row;
++             item->x = (short)col;
++             item->y = (short)row;
+              if ((++row) == Number_Of_Rows)
+                {
+                  col++;
+@@ -568,7 +568,7 @@
+ 
+       cur_item = menu->curitem;
+       assert(cur_item);
+-      menu->toprow = new_toprow;
++      menu->toprow = (short)new_toprow;
+       menu->curitem = new_current_item;
+ 
+       if (mterm_called)
+@@ -590,7 +590,7 @@
+     }
+   else
+     {                          /* if we are not posted, this is quite simple */
+-      menu->toprow = new_toprow;
++      menu->toprow = (short)new_toprow;
+       menu->curitem = new_current_item;
+     }
+ }
+diff -Naur ncurses-5.9.orig/menu/m_hook.c ncurses-5.9/menu/m_hook.c
+--- ncurses-5.9.orig/menu/m_hook.c      2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_hook.c   2012-08-25 19:58:00.983226792 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,13 +37,13 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_hook.c,v 1.15 2010/01/23 21:16:54 tom Exp $")
++MODULE_ID("$Id: m_hook.c,v 1.16 2012/03/10 23:43:41 tom Exp $")
+ 
+ /* "Template" macro to generate function to set application specific hook */
+ #define GEN_HOOK_SET_FUNCTION( typ, name ) \
+ NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook func )\
+ {\
+-   T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), menu, func));\
++   T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), (void *) menu, func));\
+    (Normalize_Menu(menu) -> typ ## name = func );\
+    RETURN(E_OK);\
+ }
+diff -Naur ncurses-5.9.orig/menu/m_item_new.c ncurses-5.9/menu/m_item_new.c
+--- ncurses-5.9.orig/menu/m_item_new.c  2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_item_new.c       2012-08-25 19:58:01.719889976 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -44,7 +44,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: m_item_new.c,v 1.30 2010/01/23 21:20:11 tom Exp $")
++MODULE_ID("$Id: m_item_new.c,v 1.33 2012/06/09 23:55:15 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu  
+@@ -62,7 +62,7 @@
+   int result = TRUE;
+ 
+ #if USE_WIDEC_SUPPORT
+-  int count = mbstowcs(0, s, 0);
++  int count = (int)mbstowcs(0, s, 0);
+   wchar_t *temp = 0;
+ 
+   assert(s);
+@@ -127,13 +127,13 @@
+        {
+          *item = _nc_Default_Item;     /* hope we have struct assignment */
+ 
+-         item->name.length = strlen(name);
++         item->name.length = (unsigned short)strlen(name);
+          item->name.str = name;
+ 
+          if (description && (*description != '\0') &&
+              Is_Printable_String(description))
+            {
+-             item->description.length = strlen(description);
++             item->description.length = (unsigned short)strlen(description);
+              item->description.str = description;
+            }
+          else
+@@ -195,12 +195,12 @@
+ NCURSES_EXPORT(int)
+ set_menu_mark(MENU * menu, const char *mark)
+ {
+-  unsigned l;
++  short l;
+ 
+   T((T_CALLED("set_menu_mark(%p,%s)"), (void *)menu, _nc_visbuf(mark)));
+ 
+   if (mark && (*mark != '\0') && Is_Printable_String(mark))
+-    l = strlen(mark);
++    l = (short)strlen(mark);
+   else
+     l = 0;
+ 
+@@ -213,7 +213,7 @@
+        {
+          /* If the menu is already posted, the geometry is fixed. Then
+             we can only accept a mark with exactly the same length */
+-         if (menu->marklen != (int)l)
++         if (menu->marklen != l)
+            RETURN(E_BAD_ARGUMENT);
+        }
+       menu->marklen = l;
+@@ -222,14 +222,13 @@
+          menu->mark = strdup(mark);
+          if (menu->mark)
+            {
+-             strcpy(menu->mark, mark);
+              if (menu != &_nc_Default_Menu)
+-               menu->status |= _MARK_ALLOCATED;
++               SetStatus(menu, _MARK_ALLOCATED);
+            }
+          else
+            {
+              menu->mark = old_mark;
+-             menu->marklen = (old_mark != 0) ? strlen(old_mark) : 0;
++             menu->marklen = (short)((old_mark != 0) ? strlen(old_mark) : 0);
+              RETURN(E_SYSTEM_ERROR);
+            }
+        }
+diff -Naur ncurses-5.9.orig/menu/m_pad.c ncurses-5.9/menu/m_pad.c
+--- ncurses-5.9.orig/menu/m_pad.c       2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_pad.c    2012-08-25 19:58:00.983226792 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_pad.c,v 1.12 2010/01/23 21:20:10 tom Exp $")
++MODULE_ID("$Id: m_pad.c,v 1.13 2012/03/10 23:43:41 tom Exp $")
+ 
+ /* Macro to redraw menu if it is posted and changed */
+ #define Refresh_Menu(menu) \
+@@ -69,7 +69,7 @@
+     RETURN(E_BAD_ARGUMENT);
+ 
+   Normalize_Menu(menu);
+-  menu->pad = pad;
++  menu->pad = (unsigned char)pad;
+ 
+   if (do_refresh)
+     Refresh_Menu(menu);
+diff -Naur ncurses-5.9.orig/menu/m_post.c ncurses-5.9/menu/m_post.c
+--- ncurses-5.9.orig/menu/m_post.c      2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_post.c   2012-08-25 19:58:01.723223294 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_post.c,v 1.29 2010/05/01 19:18:27 tom Exp $")
++MODULE_ID("$Id: m_post.c,v 1.31 2012/06/09 23:54:35 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu
+@@ -67,7 +67,7 @@
+      - it is a onevalued menu and it is the current item
+      - or it has a selection value
+    */
+-  wattron(menu->win, menu->back);
++  wattron(menu->win, (int)menu->back);
+   if (item->value || (item == menu->curitem))
+     {
+       if (menu->marklen)
+@@ -79,13 +79,13 @@
+             item. */
+          if (!(menu->opt & O_ONEVALUE) && item->value && item != menu->curitem)
+            {
+-             wattron(menu->win, menu->fore);
++             wattron(menu->win, (int)menu->fore);
+              isfore = TRUE;
+            }
+          waddstr(menu->win, menu->mark);
+          if (isfore)
+            {
+-             wattron(menu->win, menu->fore);
++             wattron(menu->win, (int)menu->fore);
+              isfore = FALSE;
+            }
+        }
+@@ -93,7 +93,7 @@
+   else                         /* otherwise we have to wipe out the marker area */
+     for (ch = ' ', i = menu->marklen; i > 0; i--)
+       waddch(menu->win, ch);
+-  wattroff(menu->win, menu->back);
++  wattroff(menu->win, (int)menu->back);
+   count += menu->marklen;
+ 
+   /* First we have to calculate the attribute depending on selectability
+@@ -101,19 +101,19 @@
+    */
+   if (!(item->opt & O_SELECTABLE))
+     {
+-      wattron(menu->win, menu->grey);
++      wattron(menu->win, (int)menu->grey);
+       isgrey = TRUE;
+     }
+   else
+     {
+       if (item->value || item == menu->curitem)
+        {
+-         wattron(menu->win, menu->fore);
++         wattron(menu->win, (int)menu->fore);
+          isfore = TRUE;
+        }
+       else
+        {
+-         wattron(menu->win, menu->back);
++         wattron(menu->win, (int)menu->back);
+          isback = TRUE;
+        }
+     }
+@@ -158,10 +158,10 @@
+          assert(cx >= 0 && cy >= 0);
+          getyx(menu->win, ncy, ncx);
+          if (isgrey)
+-           wattroff(menu->win, menu->grey);
++           wattroff(menu->win, (int)menu->grey);
+          else if (isfore)
+-           wattroff(menu->win, menu->fore);
+-         wattron(menu->win, menu->back);
++           wattroff(menu->win, (int)menu->fore);
++         wattron(menu->win, (int)menu->back);
+          for (j = 1; j < menu->spc_rows; j++)
+            {
+              if ((item_y + j) < getmaxy(menu->win))
+@@ -175,17 +175,17 @@
+            }
+          wmove(menu->win, ncy, ncx);
+          if (!isback)
+-           wattroff(menu->win, menu->back);
++           wattroff(menu->win, (int)menu->back);
+        }
+     }
+ 
+   /* Remove attributes */
+   if (isfore)
+-    wattroff(menu->win, menu->fore);
++    wattroff(menu->win, (int)menu->fore);
+   if (isback)
+-    wattroff(menu->win, menu->back);
++    wattroff(menu->win, (int)menu->back);
+   if (isgrey)
+-    wattroff(menu->win, menu->grey);
++    wattroff(menu->win, (int)menu->grey);
+ }
+ 
+ /*---------------------------------------------------------------------------
+@@ -225,7 +225,7 @@
+        {
+          _nc_Post_Item(menu, hitem);
+ 
+-         wattron(menu->win, menu->back);
++         wattron(menu->win, (int)menu->back);
+          if (((hitem = hitem->right) != lasthor) && hitem)
+            {
+              int i, j, cy, cx;
+@@ -244,7 +244,7 @@
+            }
+        }
+       while (hitem && (hitem != lasthor));
+-      wattroff(menu->win, menu->back);
++      wattroff(menu->win, (int)menu->back);
+ 
+       item = item->down;
+       y += menu->spc_rows;
+@@ -305,7 +305,7 @@
+   else
+     RETURN(E_NOT_CONNECTED);
+ 
+-  menu->status |= _POSTED;
++  SetStatus(menu, _POSTED);
+ 
+   if (!(menu->opt & O_ONEVALUE))
+     {
+@@ -369,7 +369,7 @@
+   delwin(menu->win);
+   menu->win = (WINDOW *)0;
+ 
+-  menu->status &= ~_POSTED;
++  ClrStatus(menu, _POSTED);
+ 
+   RETURN(E_OK);
+ }
+diff -Naur ncurses-5.9.orig/menu/m_req_name.c ncurses-5.9/menu/m_req_name.c
+--- ncurses-5.9.orig/menu/m_req_name.c  2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_req_name.c       2012-08-25 19:58:02.023221875 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_req_name.c,v 1.21 2009/10/10 16:17:23 tom Exp $")
++MODULE_ID("$Id: m_req_name.c,v 1.22 2012/07/21 23:27:32 tom Exp $")
+ 
+ static const char *request_names[MAX_MENU_COMMAND - MIN_MENU_COMMAND + 1] =
+ {
+@@ -99,23 +99,26 @@
+   /* because the table is so small, it doesn't really hurt
+      to run sequentially through it.
+    */
+-  unsigned int i = 0;
++  size_t i = 0;
+   char buf[16];
+ 
+   T((T_CALLED("menu_request_by_name(%s)"), _nc_visbuf(str)));
+ 
+-  if (str)
++  if (str != 0 && (i = strlen(str)) != 0)
+     {
+-      strncpy(buf, str, sizeof(buf));
+-      while ((i < sizeof(buf)) && (buf[i] != '\0'))
++      if (i > sizeof(buf) - 2)
++       i = sizeof(buf) - 2;
++      memcpy(buf, str, i);
++      buf[i] = '\0';
++
++      for (i = 0; buf[i] != '\0'; ++i)
+        {
+          buf[i] = (char)toupper(UChar(buf[i]));
+-         i++;
+        }
+ 
+       for (i = 0; i < A_SIZE; i++)
+        {
+-         if (strncmp(request_names[i], buf, sizeof(buf)) == 0)
++         if (strcmp(request_names[i], buf) == 0)
+            returnCode(MIN_MENU_COMMAND + (int)i);
+        }
+     }
+diff -Naur ncurses-5.9.orig/menu/m_spacing.c ncurses-5.9/menu/m_spacing.c
+--- ncurses-5.9.orig/menu/m_spacing.c   2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/m_spacing.c        2012-08-25 19:58:00.986560110 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_spacing.c,v 1.18 2010/01/23 21:20:10 tom Exp $")
++MODULE_ID("$Id: m_spacing.c,v 1.19 2012/03/10 23:43:41 tom Exp $")
+ 
+ #define MAX_SPC_DESC ((TABSIZE) ? (TABSIZE) : 8)
+ #define MAX_SPC_COLS ((TABSIZE) ? (TABSIZE) : 8)
+@@ -70,9 +70,9 @@
+       ((s_col < 0) || (s_col > MAX_SPC_COLS)))
+     RETURN(E_BAD_ARGUMENT);
+ 
+-  m->spc_desc = s_desc ? s_desc : 1;
+-  m->spc_rows = s_row ? s_row : 1;
+-  m->spc_cols = s_col ? s_col : 1;
++  m->spc_desc = (short)(s_desc ? s_desc : 1);
++  m->spc_rows = (short)(s_row ? s_row : 1);
++  m->spc_cols = (short)(s_col ? s_col : 1);
+   _nc_Calculate_Item_Length_and_Width(m);
+ 
+   RETURN(E_OK);
+diff -Naur ncurses-5.9.orig/menu/menu.priv.h ncurses-5.9/menu/menu.priv.h
+--- ncurses-5.9.orig/menu/menu.priv.h   2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/menu.priv.h        2012-08-25 19:58:00.986560110 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,7 +30,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: menu.priv.h,v 1.23 2009/02/28 21:02:57 juergen Exp $ */
++/* $Id: menu.priv.h,v 1.24 2012/03/10 23:43:41 tom Exp $ */
+ 
+ /***************************************************************************
+ * Module menu.priv.h                                                       *
+@@ -39,6 +39,7 @@
+ 
+ #ifndef MENU_PRIV_H_incl
+ #define MENU_PRIV_H_incl 1
++/* *INDENT-OFF* */
+ 
+ #include "curses.priv.h"
+ #include "mf_common.h"
+@@ -99,10 +100,11 @@
+ */
+ #define Adjust_Current_Item(menu,row,item) \
+   { if ((item)->y < row) \
+-      row = (item)->y;\
+-    if ( (item)->y >= (row + (menu)->arows) )\
+-      row = ( (item)->y < ((menu)->rows - row) ) ? \
+-            (item)->y : (menu)->rows - (menu)->arows;\
++      row = (short) (item)->y; \
++    if ( (item)->y >= (row + (menu)->arows) ) \
++      row = (short) (( (item)->y < ((menu)->rows - row) ) \
++                     ? (item)->y \
++                    : (menu)->rows - (menu)->arows); \
+     _nc_New_TopRow_and_CurrentItem(menu,row,item); }
+ 
+ /* Reset the match pattern buffer */
+@@ -152,5 +154,6 @@
+ #define returnMenuOpts(code)   return code
+ 
+ #endif /* TRACE/!TRACE */
++/* *INDENT-ON* */
+ 
+ #endif /* MENU_PRIV_H_incl */
+diff -Naur ncurses-5.9.orig/menu/mf_common.h ncurses-5.9/menu/mf_common.h
+--- ncurses-5.9.orig/menu/mf_common.h   2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/menu/mf_common.h        2012-08-25 19:58:01.723223294 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2004,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,7 +30,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: mf_common.h,v 0.22 2005/11/26 15:26:52 tom Exp $ */
++/* $Id: mf_common.h,v 0.24 2012/06/10 00:06:54 tom Exp $ */
+ 
+ /* Common internal header for menu and form library */
+ 
+@@ -63,10 +63,9 @@
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
+-#define MODULE_ID(id) /*nothing*/
++#define MODULE_ID(id)          /*nothing */
+ #endif
+ 
+-
+ /* Maximum regular 8-bit character code */
+ #define MAX_REGULAR_CHARACTER (0xff)
+ 
+@@ -80,16 +79,19 @@
+ #endif
+ 
+ /* The few common values in the status fields for menus and forms */
+-#define _POSTED         (0x01U)  /* menu or form is posted                  */
+-#define _IN_DRIVER      (0x02U)  /* menu or form is processing hook routine */
++#define _POSTED         (0x01U)        /* menu or form is posted                  */
++#define _IN_DRIVER      (0x02U)        /* menu or form is processing hook routine */
++
++#define SetStatus(target,mask) (target)->status |= (unsigned short) (mask)
++#define ClrStatus(target,mask) (target)->status = (unsigned short) (target->status & (~mask))
+ 
+ /* Call object hook */
+ #define Call_Hook( object, handler ) \
+    if ( (object) != 0 && ((object)->handler) != (void *) 0 )\
+    {\
+-       (object)->status |= _IN_DRIVER;\
++       SetStatus(object, _IN_DRIVER);\
+        (object)->handler(object);\
+-       (object)->status &= ~_IN_DRIVER;\
++       ClrStatus(object, _IN_DRIVER);\
+    }
+ 
+ #endif /* MF_COMMON_H_incl */
 diff -Naur ncurses-5.9.orig/misc/Makefile.in ncurses-5.9/misc/Makefile.in
---- ncurses-5.9.orig/misc/Makefile.in   2012-02-16 18:25:12.611808773 +0000
-+++ ncurses-5.9/misc/Makefile.in        2012-02-16 18:25:13.287826611 +0000
+--- ncurses-5.9.orig/misc/Makefile.in   2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/misc/Makefile.in        2012-08-25 19:58:02.359886951 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.56 2011/02/21 01:09:31 tom Exp $
-+# $Id: Makefile.in,v 1.59 2012/02/11 16:22:49 tom Exp $
++# $Id: Makefile.in,v 1.60 2012/08/11 21:31:56 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
@@ -31599 +38559 @@
  # Permission is hereby granted, free of charge, to any person obtaining a    #
  # copy of this software and associated documentation files (the "Software"), #
-@@ -120,7 +120,8 @@
+@@ -56,6 +56,7 @@
+ exec_prefix    = @exec_prefix@
+ bindir         = @bindir@
+ libdir         = @libdir@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ 
+ tabsetdir      = $(datadir)/tabset
+@@ -120,7 +121,8 @@
  
  run_tic.sed :
@@ -31609 +38577 @@
  
  $(DESTDIR)$(bindir) \
-@@ -139,7 +140,7 @@
+@@ -139,7 +141,7 @@
  
  uninstall.libs :
@@ -31619 +38587 @@
  
 diff -Naur ncurses-5.9.orig/misc/gen-pkgconfig.in ncurses-5.9/misc/gen-pkgconfig.in
---- ncurses-5.9.orig/misc/gen-pkgconfig.in      2012-02-16 18:25:12.607808668 +0000
-+++ ncurses-5.9/misc/gen-pkgconfig.in   2012-02-16 18:25:13.059820594 +0000
+--- ncurses-5.9.orig/misc/gen-pkgconfig.in      2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/misc/gen-pkgconfig.in   2012-08-25 19:58:00.176563939 +0000
 @@ -1,7 +1,7 @@
  #!@SHELL@
@@ -31746 +38714 @@
  # vile:shmode
 diff -Naur ncurses-5.9.orig/misc/gen_edit.sh ncurses-5.9/misc/gen_edit.sh
---- ncurses-5.9.orig/misc/gen_edit.sh   2012-02-16 18:25:12.607808668 +0000
-+++ ncurses-5.9/misc/gen_edit.sh        2012-02-16 18:25:13.287826611 +0000
+--- ncurses-5.9.orig/misc/gen_edit.sh   2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/misc/gen_edit.sh        2012-08-25 19:58:01.183225848 +0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
@@ -31761 +38729 @@
  #
 -# $Id: gen_edit.sh,v 1.1 2004/07/11 15:01:29 tom Exp $
-+# $Id: gen_edit.sh,v 1.4 2012/02/11 16:30:03 tom Exp $
++# $Id: gen_edit.sh,v 1.5 2012/04/01 15:04:37 tom Exp $
  # Generate a sed-script for converting the terminfo.src to the form which will
  # be installed.
  #
-@@ -37,12 +37,13 @@
+@@ -37,22 +37,82 @@
  #      The leaf directory names (lib, tabset, terminfo)
  #
  
 -: ${ticdir=@TERMINFO@}
-+: ${datadir=@datadir@}
- : ${xterm_new=@WHICH_XTERM@}
-+: ${xterm_kbs=@XTERM_KBS@}
+-: ${xterm_new=@WHICH_XTERM@}
++linux_dft=linux2.2
++
++: ${datadir=/usr/share}
++: ${WHICH_LINUX=$linux_dft}
++: ${WHICH_XTERM=xterm-new}
++: ${XTERM_KBS=BS}
  
  # If we're not installing into /usr/share/, we'll have to adjust the location
@@ -31781 +38753 @@
  cat <<EOF
  s%/usr/share/tabset%$TABSET%g
-@@ -56,3 +57,35 @@
+ EOF
+ fi
+ 
+-if test "$xterm_new" != "xterm-new" ; then
++if test "$WHICH_XTERM" != "xterm-new" ; then
++echo "** using $WHICH_XTERM terminal description for XTerm entry" >&2
+ cat <<EOF
+ /^# This is xterm for ncurses/,/^$/{
+        s/use=xterm-new,/use=$WHICH_XTERM,/
  }
  EOF
  fi
 +
-+if test "$xterm_kbs" != "BS" ; then
++if test "$XTERM_KBS" != "BS" ; then
++echo "** using DEL for XTerm backspace-key" >&2
 +cat <<EOF
 +/^xterm+kbs|fragment for backspace key/,/^#/{
@@ -31796 +38777 @@
 +# Work around incompatibities built into Linux console.  The 2.6 series added
 +# a patch to fixup the SI/SO behavior, which is closer to vt100, but the older
-+# kernels do not recognize those controls.
-+system=`uname -s 2>/dev/null`
-+if test "x$system" = xLinux
++# kernels do not recognize those controls.  All of the kernels recognize the
++# older flavor of rmacs/smacs, but beginning in the late 1990s, changes made
++# as part of implementing UTF-8 prevent using those for line-drawing when the
++# console is in UTF-8 mode.  Taking into account the fact that it took about
++# ten years to provide (and distribute) the 2.6 series' change for SI/SO, the
++# default remains "linux2.2".
++case x$WHICH_LINUX in #(vi
++xauto)
++       system=`uname -s 2>/dev/null`
++       if test "x$system" = xLinux
++       then
++               case x`uname -r` in
++               x1.*)
++                       WHICH_LINUX=linux-c
++                       ;;
++               x2.[0-4]*)
++                       WHICH_LINUX=linux2.2
++                       ;;
++               *)
++                       WHICH_LINUX=linux3.0
++                       ;;
++               esac
++       else
++               WHICH_LINUX=$linux_dft
++       fi
++       ;;
++xlinux*)
++       # allow specific setting
++       ;;
++*)
++       WHICH_LINUX=$linux_dft
++       ;;
++esac
++
++if test $WHICH_LINUX != $linux_dft
 +then
-+       case x`uname -r` in
-+       x1.*)
++echo "** using $WHICH_LINUX terminal description for Linux console" >&2
 +cat <<EOF
 +/^# This is Linux console for ncurses/,/^$/{
-+       s/use=linux3.0,/use=linux-c,/
++       s/use=$linux_dft,/use=$WHICH_LINUX,/
 +}
 +EOF
-+               ;;
-+       x2.[0-4]*)
-+cat <<EOF
-+/^# This is Linux console for ncurses/,/^$/{
-+       s/use=linux3.0,/use=linux2.2,/
-+}
-+EOF
-+               ;;
-+       esac
 +fi
 diff -Naur ncurses-5.9.orig/misc/ncurses-config.in ncurses-5.9/misc/ncurses-config.in
---- ncurses-5.9.orig/misc/ncurses-config.in     2012-02-16 18:25:12.607808668 +0000
-+++ ncurses-5.9/misc/ncurses-config.in  2012-02-16 18:25:12.967818168 +0000
+--- ncurses-5.9.orig/misc/ncurses-config.in     2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/misc/ncurses-config.in  2012-08-25 19:58:02.363220268 +0000
 @@ -1,5 +1,5 @@
  #!@SHELL@
 -# $Id: ncurses-config.in,v 1.25 2011/03/19 22:43:38 tom Exp $
-+# $Id: ncurses-config.in,v 1.27 2011/08/13 22:11:20 tom Exp $
++# $Id: ncurses-config.in,v 1.28 2012/08/11 21:45:20 tom Exp $
  ##############################################################################
  # Copyright (c) 2006-2010,2011 Free Software Foundation, Inc.                #
  #                                                                            #
-@@ -41,6 +41,7 @@
+@@ -36,11 +36,13 @@
+ bindir="@bindir@"
+ includedir="@includedir@"
+ libdir="@libdir@"
++datarootdir="@datarootdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
  
  THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
@@ -31835 +38844 @@
  LANG=C;                export LANG
  LANGUAGE=C;    export LANGUAGE
-@@ -83,13 +84,19 @@
+@@ -83,13 +85,19 @@
  ENDECHO
                 ;;
@@ -31857 +38866 @@
                 fi
                 ;;
-@@ -163,4 +170,5 @@
+@@ -163,4 +171,5 @@
         esac
         shift
@@ -31863 +38872 @@
 +# vi:ts=4 sw=4
  # vile:shmode
+diff -Naur ncurses-5.9.orig/misc/run_tic.in ncurses-5.9/misc/run_tic.in
+--- ncurses-5.9.orig/misc/run_tic.in    2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/misc/run_tic.in 2012-08-25 19:58:02.363220268 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.32 2011/02/23 23:30:15 tom Exp $
++# $Id: run_tic.in,v 1.33 2012/08/11 21:45:47 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -48,6 +48,7 @@
+ : ${bindir:=@bindir@}
+ : ${top_srcdir:=@top_srcdir@}
+ : ${srcdir:=@srcdir@}
++: ${datarootdir:=@datarootdir@}
+ : ${datadir:=@datadir@}
+ : ${TIC_PATH:=@TIC_PATH@}
+ : ${ticdir:=@TERMINFO@}
 diff -Naur ncurses-5.9.orig/misc/terminfo.src ncurses-5.9/misc/terminfo.src
---- ncurses-5.9.orig/misc/terminfo.src  2012-02-16 18:25:12.607808668 +0000
-+++ ncurses-5.9/misc/terminfo.src       2012-02-16 18:25:13.299826928 +0000
+--- ncurses-5.9.orig/misc/terminfo.src  2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/misc/terminfo.src       2012-08-25 19:58:02.389886808 +0000
 @@ -6,8 +6,8 @@
  # Report bugs and new terminal descriptions to
@@ -31872 +38899 @@
 -#      $Revision: 1.383 $
 -#      $Date: 2011/02/20 20:46:53 $
-+#      $Revision: 1.426 $
-+#      $Date: 2012/02/11 23:38:27 $
++#      $Revision: 1.466 $
++#      $Date: 2012/08/11 15:27:54 $
  #
  # The original header is preserved below for reference.  It is noted that there
  # is a "newer" version which differs in some cosmetic details (but actually
-@@ -690,9 +690,7 @@
+@@ -321,7 +321,7 @@
+ # DEL and ^C are hardcoded to act as kill characters.
+ # ^D acts as a line break (just like newline).
+ # It also interprets
+-#      \033];xxx\007 
++#      \033];xxx\007
+ # for compatibility with xterm -TD
+ 9term|Plan9 terminal emulator for X,
+        am,
+@@ -376,11 +376,19 @@
+        dim=\E[2m,
+        sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;%;%?%p7%t8;%;m,
+        use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
+-ansi+pp|ansi printer port,
+-       mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+ ansi+csr|ansi scroll-region plus cursor save & restore,
+        csr=\E[%i%p1%d;%p2%dr, rc=\E8, sc=\E7,
+ 
++# The normal (ANSI) flavor of "media copy" building block asserts that
++# characters sent to the printer do not echo on the screen. DEC terminals
++# can also be put into autoprinter mode, where each line is sent to the
++# printer as you move off that line, e.g., by a carriage return.
++ansi+pp|ansi printer port,
++       mc5i,
++       mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
++dec+pp|DEC autoprinter mode,
++       mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i,
++
+ # The IBM PC alternate character set.  Plug this into any Intel console entry.
+ # We use \E[11m for rmacs rather than \E[12m so the <acsc> string can use the
+ # ROM graphics for control characters such as the diamond, up- and down-arrow.
+@@ -456,9 +464,10 @@
+        cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C,
+        cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
+        dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX,
+-       hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
+-       indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT, rmam=\E[?7l, sc=\E7,
+-       smam=\E[?7h, tbc=\E[g, vpa=\E[%i%p1%dd,
++       hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
++       il=\E[%p1%dL, indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT,
++       rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
++       vpa=\E[%i%p1%dd,
+ 
+ #### ANSI/ECMA-48 terminals and terminal emulators
+ #
+@@ -488,7 +497,7 @@
+ # ansi-mtabs adds relative addressing and minimal tab support
+ ansi-mtabs|any ansi terminal with pessimistic assumptions,
+        it#8,
+-       ht=^I, use=ansi+local1, use=ansi-mini,
++       ht=^I, use=ansi-mini, use=ansi+local1,
+ 
+ # ANSI X3.64 from emory!mlhhh (Hugh Hansard) via BRL
+ #
+@@ -690,9 +699,7 @@
         use=ansi.sysk,
  
@@ -31887 +38968 @@
  # Atari ST terminals.
  # From Guido Flohr <gufl0000@stud.uni-sb.de>.
-@@ -909,7 +907,7 @@
+@@ -909,7 +916,7 @@
         khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
         kspd=^Z, nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l,
@@ -31896 +38977 @@
         vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr,
         use=ecma+color,
-@@ -936,10 +934,27 @@
+@@ -936,10 +943,30 @@
  # The 2.2.x kernels add a private mode that sets the cursor type; use that to
  # get a block cursor for cvvis.
@@ -31909 +38990 @@
 +# Using SI/SO has the drawback that it confuses screen.  SCS would work.
 +# However, SCS is buggy (see comment in Debian #515609) -TD
++# Further, this breaks longstanding workarounds for Linux console's line
++# drawing (see Debian 665959) -TD
 +linux2.6|linux 2.6.x console,
 +       rmacs=^O,
@@ -31915 +38998 @@
 +
 +# The 3.0 kernel adds support for clearing scrollback buffer (capability E3).
++# It is the same as xterm's erase-saved-lines feature.
 +linux3.0|linux 3.0 kernels,
 +       E3=\E[3;J, use=linux2.6,
@@ -31920 +39004 @@
 +# This is Linux console for ncurses.
 +linux|linux console,
-+       use=linux3.0,
++       use=linux2.2,
 +
  # Subject: linux 2.6.26 vt back_color_erase
  # Changes to the Linux console driver broke bce model as reported in
  #      https://bugzilla.novell.com/show_bug.cgi?id=418613
-@@ -947,7 +962,7 @@
+@@ -947,7 +974,7 @@
  #      http://lkml.org/lkml/2008/4/26/305
  #      http://groups.google.com/group/fa.linux.kernel/browse_thread/thread/87f98338f0d636bb/aa96e8b86cee0d1e?lnk=st&q=#aa96e8b86cee0d1e
@@ -31934 +39018 @@
  # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
  linux-nic|linux with ich/ich1 suppressed for non-curses programs,
-@@ -1053,6 +1068,24 @@
+@@ -1024,7 +1051,7 @@
+        kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
+        kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
+        kmous=\E[M, knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=^M^J,
+-       op=\E49;39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
++       op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
+        rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+        sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m,
+ 
+@@ -1053,6 +1080,24 @@
         dim=\E[2m, invis=\E[8m, op=\E[37;40m, rmso=\E[27m,
         setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=mach,
@@ -31959 +39052 @@
  # http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/hurd/hurd/console/
  #
-@@ -1649,6 +1682,56 @@
+@@ -1183,7 +1228,7 @@
+        civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr,
+        cvvis=\E[=2c, mgc=\E[=r, oc=\E[51m, op=\E[50m,
+        rep=\E[%p1%d;%p2%db, rmm=\E[=11L,
+-       sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
++       sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%e;10%;m,
+        smgb=\E[=1;0m, smgbp=\E[=1;%i%p1%dm,
+        smglp=\E[=2;%i%p1%dm, smgr=\E[=3;0m,
+        smgrp=\E[=3;%i%p1%dm, smgt=\E[=0;0m,
+@@ -1649,6 +1694,56 @@
  qansi-w|QNX ansi for windows,
         xvpa, use=qansi-m,
@@ -32016 +39118 @@
  #
  # pcvt termcap database entries (corresponding to release 3.31)
-@@ -1786,7 +1869,7 @@
+@@ -1786,7 +1881,7 @@
  ofcons|DNARD OpenFirmware console,
         bw,
@@ -32025 +39127 @@
         cuf=\233%p1%dC, cuf1=\233C, cup=\233%i%p1%d;%p2%dH,
         cuu=\233%p1%dA, cuu1=\233A, dch=\233%p1%dP, dch1=\233P,
-@@ -1798,8 +1881,8 @@
+@@ -1798,8 +1893,8 @@
         kf4=\2330x, kf5=\2330t, kf6=\2330u, kf7=\2330q, kf8=\2330r,
         kf9=\2330p, knp=\233/, kpp=\233?, nel=^M^J, rev=\2337m,
@@ -32036 +39138 @@
  # NetBSD "wscons" emulator in vt220 mode.
  # This entry is based on the NetBSD termcap entry, correcting the ncv value.
-@@ -2937,6 +3020,28 @@
+@@ -1816,7 +1911,8 @@
+ wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
+        bce, msgr,
+        colors#8, cols#80, it#8, lines#25, ncv#2, pairs#64,
+-       is2=\E[r\E[25;1H, kend=\E[8~, kf1=\E[11~, kf10=\E[21~,
++       civis=\E[?25l, cnorm=\E[?25h, is2=\E[r\E[25;1H,
++       kdch1=\E[3~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~,
+        kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
+        kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+        kf9=\E[20~, khome=\E[7~, op=\E[m, rs1=\Ec,
+@@ -2377,8 +2473,9 @@
+ # with the key marked (ESC) on the vt220.  See vt220d for an alternate mapping.
+ # PF1--PF4 are used as F1--F4.
+ #
++# added msgr -TD
+ vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
+-       OTbs, OTpt, am, mir, xenl, xon,
++       OTbs, OTpt, am, mir, msgr, xenl, xon,
+        cols#80, lines#24, vt#3,
+        OTnl=^J,
+        acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+@@ -2404,8 +2501,15 @@
+ # A much better description of the VT200/220; used to be vt220-8
+ # changed rmacs/smacs from shift-in/shift-out to vt200-old's explicit G0/G1
+ # designation to accommodate bug in pcvt -TD
++#
++# Here's a picture of the VT220 editing keypad:
++#      +--------+--------+--------+
++#      | Find   | Insert | Remove |
++#      +--------+--------+--------+
++#      | Select | Prev   | Next   |
++#      +--------+--------+--------+
+ vt220|vt200|dec vt220,
+-       OTbs, am, mc5i, mir, msgr, xenl, xon,
++       OTbs, am, mir, msgr, xenl, xon,
+        cols#80, it#8, lines#24, vt#3,
+        acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
+@@ -2418,19 +2522,20 @@
+        ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
+        il=\E[%p1%dL, il1=\E[L, ind=\ED,
+        is2=\E[?7h\E[>\E[?1h\E F\E[?4l, kbs=^H, kcub1=\E[D,
+-       kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
+-       kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+-       kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
+-       kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
+-       kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, khlp=\E[28~,
+-       kich1=\E[2~, knp=\E[6~, kpp=\E[5~, krdo=\E[29~, kslt=\E[4~,
+-       lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[i, mc4=\E[4i,
+-       mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+-       rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
+-       rmul=\E[24m, rs1=\E[?3l, sc=\E7,
++       kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP,
++       kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
++       kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
++       kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
++       kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
++       khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
++       krdo=\E[29~, kslt=\E[4~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
++       nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>,
++       rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++       rs1=\E[?3l, sc=\E7,
+        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+        sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+-       smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++       smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+pp,
++       use=ansi+enq,
+ vt220-w|vt200-w|DEC vt220 in wide mode,
+        cols#132,
+        rs3=\E[?3h, use=vt220,
+@@ -2449,16 +2554,16 @@
+        il=\233%p1%dL, il1=\233L, ind=\ED,
+        is2=\233?7h\233>\233?1h\E F\233?4l, kbs=^H,
+        kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A,
+-       kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~,
+-       kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~,
+-       kf19=\23333~, kf2=\EOQ, kf20=\23334~, kf3=\EOR, kf4=\EOS,
+-       kf6=\23317~, kf7=\23318~, kf8=\23319~, kf9=\23320~,
+-       kfnd=\2331~, khlp=\23328~, khome=\233H, kich1=\2332~,
+-       knp=\2336~, kpp=\2335~, krdo=\23329~, kslt=\2334~, lf1=pf1,
+-       lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i,
+-       nel=\EE, rc=\E8, rev=\2337m, ri=\EM, rmacs=\E(B,
+-       rmam=\233?7l, rmir=\2334l, rmso=\23327m, rmul=\23324m,
+-       rs1=\233?3l, sc=\E7,
++       kdch1=\2333~, kf1=\EOP, kf10=\23321~, kf11=\23323~,
++       kf12=\23324~, kf13=\23325~, kf14=\23326~, kf17=\23331~,
++       kf18=\23332~, kf19=\23333~, kf2=\EOQ, kf20=\23334~,
++       kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~, kf8=\23319~,
++       kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\233H,
++       kich1=\2332~, knp=\2336~, kpp=\2335~, krdo=\23329~,
++       kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i,
++       mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, rev=\2337m, ri=\EM,
++       rmacs=\E(B, rmam=\233?7l, rmir=\2334l, rmso=\23327m,
++       rmul=\23324m, rs1=\233?3l, sc=\E7,
+        sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+        sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smir=\2334h,
+        smso=\2337m, smul=\2334m, tbc=\2333g,
+@@ -2495,8 +2600,9 @@
+ #
+ # From: Alexander Latzko <latzko@marsenius.rutgers.edu>, 30 Dec 1996
+ # (Added vt100 <rc>,<sc> to quiet a tic warning -- esr)
++# added msgr -TD
+ vt200-js|vt220-js|dec vt200 series with jump scroll,
+-       am,
++       am, msgr,
+        cols#80,
+        bel=^G, clear=\E[H\E[J, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+        cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+@@ -2534,7 +2640,7 @@
+ # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
+ # (vt320: uncommented <fsl> --esr)
+ vt320|vt300|dec vt320 7 bit terminal,
+-       am, eslok, hs, mir, msgr, xenl,
++       am, hs, mir, msgr, xenl,
+        cols#80, lines#24, wsl#80,
+        acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+@@ -2543,9 +2649,8 @@
+        cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+        cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+        dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+-       ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$},
+-       home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
+-       il1=\E[L, ind=\ED,
++       ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I,
++       hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+        is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+        kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+        kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~,
+@@ -2553,8 +2658,7 @@
+        kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+        kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+        kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I,
+-       kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, mc0=\E[i, mc4=\E[?4i,
+-       mc5=\E[?5i, nel=\EE, rc=\E8, rev=\E[7m,
++       kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rc=\E8, rev=\E[7m,
+        rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+        rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
+        rmul=\E[m,
+@@ -2563,7 +2667,7 @@
+        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+        sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+        smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-       tsl=\E[1$}\E[H\E[K, use=vt220+keypad,
++       use=dec+pp, use=vt220+keypad, use=dec+sl, use=ansi+enq,
+ vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy,
+        am@,
+        is2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H,
+@@ -2673,33 +2777,38 @@
+        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+        sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+        smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-       tsl=\E[2$~\E[1$}\E[1;%dH,
++       tsl=\E[2$~\E[1$}\E[1;%dH, use=dec+sl,
+ 
+ # (vt420: I removed <kf0>, it collided with <kf10>.  I also restored
+ # a missing <sc> -- esr)
++# add msgr and other capabilities from vt220 -TD
+ vt420|DEC VT420,
+-       am, mir, xenl, xon,
+-       cols#80, lines#24, vt#3,
++       am, mir, msgr, xenl, xon,
++       cols#80, it#8, lines#24, vt#3,
+        acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-       bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+-       clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+-       cub1=^H, cud1=\E[B, cuf1=\E[C,
+-       cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+-       dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+-       if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED,
+-       is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+-       kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-       kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR,
+-       kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+-       kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+-       kslt=\E[4~, rc=\E8, rev=\E[7m$<2>,
+-       rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>,
+-       rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
++       bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l,
++       clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M,
++       csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
++       cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
++       cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA, cuu1=\E[A,
++       dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
++       ech=\E[%p1%dX, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K,
++       enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I,
++       hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300,
++       il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[1;24r\E[24;1H,
++       is3=\E[?67h\E[64;1"p, kbs=^H, kcub1=\E[D, kcud1=\E[B,
++       kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP, kf10=\E[29~,
++       kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~,
++       kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, kfnd=\E[1~,
++       kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, nel=\EE,
++       rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
++       ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+        rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-       rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7,
++       rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+-       sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+-       smkx=\E=, smso=\E[7m, smul=\E[4m,
++       sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h,
++       smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++       use=ansi+pp, use=dec+sl, use=ansi+enq,
+ 
+ # DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
+ # takes two parameters, the key and the string.  Translating the key is
+@@ -2772,58 +2881,11 @@
+ # terminal mode is being used.  If Set-Up has been disabled or
+ # assigned to an unknown key, Set-Up may be entered by pressing
+ # [F3] as the first key after power up, regardless of keyboard type.
+-# (vt520: I added <rmam>/<smam> based on the init string, also <sc> -- esr)
+ vt520|DEC VT520,
+-       am, mir, xenl, xon,
+-       cols#80, lines#24, vt#3,
+-       acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-       bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+-       clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+-       cub1=^H, cud1=\E[B, cuf1=\E[C,
+-       cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+-       dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+-       if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED,
+-       is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+-       kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-       kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR,
+-       kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+-       kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+-       kslt=\E[4~,
+-       pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\,
+-       rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
+-       ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+-       rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-       rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+-       sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+-       sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+-       smso=\E[7m, smul=\E[4m,
++       use=ansi+rca, use=vt420, use=ansi+tabs,
+ 
+-# (vt525: I added <rmam>/<smam> based on the init string;
+-# removed <rmso>=\E[m, <rmul>=\E[m, added <sc> -- esr)
+ vt525|DEC VT525,
+-       am, mir, xenl, xon,
+-       cols#80, lines#24, vt#3,
+-       acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-       bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+-       clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+-       cub1=^H, cud1=\E[B, cuf1=\E[C,
+-       cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+-       dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+-       if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED,
+-       is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+-       kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-       kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR,
+-       kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+-       kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+-       kslt=\E[4~,
+-       pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\,
+-       rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
+-       ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+-       rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-       rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+-       sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+-       sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+-       smso=\E[7m, smul=\E[4m,
++       use=vt520,
+ 
+ #### VT100 emulations
+ #
+@@ -2887,7 +2949,7 @@
+ # the default behavior -TD
+ 
+ putty|PuTTY terminal emulator,
+-       am, bce, bw, ccc, hs, mir, msgr, xenl, xon, XT,
++       am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
+        colors#8, it#8, ncv#22, pairs#64, U8#1,
+        acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+@@ -2897,11 +2959,10 @@
+        cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
+        dch=\E[%p1%dP, dch1=\E[P,
+        dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G\342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e%p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G\342\231\253\E%%@%e%p1%{15}%=%t\E%%G\342\230\274\E%%@%e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E%%G\340\202\242\E%%@%e%p1%c%;,
+-       dl=\E[%p1%dM, dl1=\E[M, dsl=\E]0;\007, ech=\E[%p1%dX,
+-       ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+-       flash=\E[?5h\E[?5l, fsl=^G, home=\E[H, hpa=\E[%i%p1%dG,
+-       ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J,
+-       indn=\E[%p1%dS,
++       dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
++       el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H,
++       hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
++       ind=^J, indn=\E[%p1%dS,
+        initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
+        is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
+        kb2=\E[G, kbs=\177, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
+@@ -2922,7 +2983,8 @@
+        sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
+        sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
+        smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+-       tbc=\E[3g, tsl=\E]0;, vpa=\E[%i%p1%dd, use=vt102+enq,
++       tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3;J, use=vt102+enq,
++       use=xterm+sl,
+ vt100-putty|Reset PuTTY to pure vt100,
+        rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
+        use=vt100,
+@@ -2937,6 +2999,28 @@
         kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
         kf9=\EOX, use=putty,
@@ -32065 +39470 @@
  # T. Teranishi dated Mar 10, 1998.  It is a free software terminal emulator
  # (communication program) which supports:
-@@ -3091,7 +3196,8 @@
+@@ -3091,7 +3175,8 @@
         kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m, smkx=\E[?1h\E,
         smso=\E[7m,
@@ -32075 +39480 @@
  # You can add the following line to your .Xdefaults to change the terminal type
  # set by the xterms you start up to my-xterm:
-@@ -3274,12 +3380,14 @@
+@@ -3154,7 +3239,7 @@
+ # added khome/kend, hts based on the R6 xterm code - TD
+ # (khome/kend do not actually work in X11R5 or X11R6, but many people use this
+ # for compatibility with other emulators).
+-xterm-r6|xterm-old|xterm X11R6 version,
++xterm-r6|xterm X11R6 version,
+        OTbs, am, km, mir, msgr, xenl,
+        cols#80, it#8, lines#24,
+        acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+@@ -3180,10 +3265,12 @@
+        sgr0=\E[m, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
+        smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+        use=vt100+enq,
++xterm-old|antique xterm version,
++       use=xterm-r6,
+ # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
+ # The name has been changed and some aliases have been removed.
+ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
+-       OTbs, am, bce, km, mir, msgr, xenl,
++       OTbs, am, bce, km, mir, msgr, xenl, XT,
+        cols#80, it#8, lines#24, ncv@,
+        acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+@@ -3227,13 +3314,13 @@
+ # xterm to use terminfo-based descriptions with the titeInhibit resource.
+ # -- the distribution contained incorrect khome/kend values -TD
+ xterm-xf86-v333|xterm terminal emulator (XFree86 3.3.3 Window System),
+-       mc5i,
+        blink=\E[5m, ich1@, invis=\E[8m,
+        is2=\E[!p\E[?3;4l\E[4l\E>, kdch1=\E[3~, kfnd@, kslt@,
+-       mc0=\E[i, mc4=\E[4i, mc5=\E[5i, rmcup=\E[?1047l\E[?1048l,
+-       rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
++       rmcup=\E[?1047l\E[?1048l, rs1=\Ec,
++       rs2=\E[!p\E[?3;4l\E[4l\E>,
+        sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+-       smcup=\E[?1048h\E[?1047h, use=xterm-xf86-v33,
++       smcup=\E[?1048h\E[?1047h, use=ansi+pp,
++       use=xterm-xf86-v33,
+ 
+ # This version was released in XFree86 4.0.
+ xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System),
+@@ -3274,12 +3361,14 @@
  # This version reflects the current xterm features.
  xterm-new|modern xterm terminal emulator,
@@ -32095 +39541 @@
  # This fragment describes as much of XFree86 xterm's "pc-style" function
  # keys as will fit into terminfo's 60 function keys.
-@@ -3457,7 +3565,7 @@
+@@ -3445,7 +3534,7 @@
+ #
+ # This chunk is used for building the VT220/Sun/PC keyboard variants.
+ xterm-basic|modern xterm terminal emulator - common,
+-       OTbs, am, bce, km, mc5i, mir, msgr, xenl, AX,
++       OTbs, am, bce, km, mir, msgr, xenl, AX, XT,
+        colors#8, cols#80, it#8, lines#24, pairs#64,
+        acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+@@ -3457,19 +3546,20 @@
         dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
         flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
         ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
 -       ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H,
+-       kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El,
+-       memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+-       rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
+-       rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m,
+-       rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
+-       setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 +       ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>,
-        kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El,
-        memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-        rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
-@@ -3469,7 +3577,8 @@
++       kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8,
++       rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
++       rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
++       rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++       rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm,
++       setaf=\E[3%p1%dm,
+        setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+        setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
         sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
         sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
         smir=\E[4h, smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m,
 -       smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq,
-+       smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+kbs,
-+       use=vt100+enq,
++       smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3;J,
++       use=ansi+pp, use=xterm+kbs, use=vt100+enq,
  
  # From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997
  # In retrospect, something like xterm-r6 was intended here -TD
-@@ -3527,6 +3636,28 @@
+@@ -3527,6 +3617,28 @@
  xterm-1003|testing xterm-mouse,
         XM=\E[?1003%?%p1%{1}%=%th%el%;, use=xterm-new,
@@ -32130 +39595 @@
 +#      p1 = the storage unit (clipboard, selection or cut buffer)
 +#      p2 = the base64-encoded clipboard content.
-+# 
++#
 +# Ss is used to set the cursor style as described by the DECSCUSR
 +#      function to a block or underline.
 +# Se resets the cursor style to the terminal power-on default.
-+#  
-+# Cs and Ce set and reset the cursor colour.
++#
++# Cs and Cr set and reset the cursor colour.
 +xterm+tmux|advanced xterm features used in tmux,
 +       Cr=\E]112\007, Cs=\E]12;%p1%s\007,
@@ -32143 +39608 @@
  # This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color.
  # To use it, your decTerminalID resource must be set to 200 or above.
-@@ -3552,8 +3683,8 @@
+@@ -3552,8 +3664,8 @@
         hpa=\233%i%p1%dG, ht=^I, hts=\210, ich=\233%p1%d@,
         il=\233%p1%dL, il1=\233L, ind=^J, invis=\2338m,
@@ -32154 +39619 @@
         kent=\217M, kf1=\23311~, kf10=\23321~, kf11=\23323~,
         kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
-@@ -3575,6 +3706,7 @@
+@@ -3575,6 +3687,7 @@
         smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=,
         smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR,
@@ -32162 +39627 @@
  xterm-hp|xterm with hpterm function keys,
         kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-@@ -3621,8 +3753,9 @@
+@@ -3621,8 +3734,9 @@
         acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
         bel=^G, clear=\EH\EJ, cr=^M, cub1=\ED, cud1=\EB, cuf1=\EC,
@@ -32174 +39639 @@
  xterm-noapp|xterm with cursor keys in normal mode,
         rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp,
-@@ -3659,6 +3792,15 @@
+@@ -3640,25 +3754,68 @@
+ xterm-utf8|xterm with no VT100 line-drawing in UTF-8 mode,
+        U8#1, use=xterm,
+ 
+-# These entries allow access to the X titlebar and icon name as a status line.
+-# Note that twm (and possibly window managers descended from it such as tvtwm,
+-# ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess
+-# with it.
++# These building-blocks allow access to the X titlebar and icon name as a
++# status line.  There are a few problems in using them in entries:
++#
++# a) tsl should have a parameter to denote the column on which to transfer to
++#    the status line.
++# b) the "0" code for xterm updates both icon-title and window title.  Some
++#    window managers such as twm (and possibly window managers descended from
++#    it such as tvtwm, ctwm, and vtwm) track windows by icon-name. Thus, you
++#    don't want to mess with icon-name when using those window managers.
+ xterm+sl|access X title line and icon name,
+        hs,
+-       wsl#40,
+-       dsl=\E]0;\007, fsl=^G, tsl=\E]0;, use=xterm,
++       dsl=\E]0;\007, fsl=^G, tsl=\E]0;,
+ xterm+sl-twm|access X title line (pacify twm-descended window managers),
+        hs,
+-       wsl#40,
+-       dsl=\E]2;\007, fsl=^G, tsl=\E]2;, use=xterm,
++       dsl=\E]2;\007, fsl=^G, tsl=\E]2;,
++
++# In contrast, this block can be used for a DEC vt320 and up.  There are two
++# controls used.
++#
++# DECSASD (select active status display)
++#      \E[0$}  Main display
++#      \E[1$}  Status line
++#
++# DECSSDT (select status line type)
++#      \E[0$~  No status line
++#      \E[1$~  Indicator status line
++#      \E[2$~  Host-writable status line
++#
++# The building block assumes that the terminal always shows something at the
++# status line (either the indicator, or status line).  That is because if no
++# status line is used, then the terminal makes that line part of the user
++# window, changing its size without notice.
++#
++# Because there is no "esl" (enable status line) capability, the "tsl"
++# capability ensures that the status line is host-writable.  A DEC terminal
++# will clear the status line when changing from indicator to host-writable
++# mode.
++#
++# Once on the status line, the row part of cursor addressing is ignored.  Since
++# tsl expects a parameter (to specify the column), the shortest addressing that
++# can be used for this purpose is HPA, e.g., \E[5d to go to column 5.
++#
++dec+sl|DEC VTxx status line,
++       eslok, hs,
++       dsl=\E[1$~, fsl=\E[0$}, tsl=\E[2$~\E[1$}\E[%i%p1%d`,
+ 
+ #
+ # The following xterm variants don't depend on your base version
+ #
  # xterm with bold instead of underline
  xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold,
++       sgr=%?%p9%t\016%e\017%;B\E[0%?%p6%t;1%;%?%p2%t;1%;%?%p1%p3%|%t;7%;m,
         smso=\E[7m, smul=\E[1m, use=xterm-old,
 +
@@ -32190 +39716 @@
  # (kterm should not invoke DEC Graphics as the alternate character set
  #  -- Kenji Rikitake)
-@@ -3676,12 +3818,50 @@
+@@ -3676,12 +3833,51 @@
         tsl=\E[?E\E[?%i%p1%dT, use=xterm-r6, use=ecma+color,
  kterm-color|kterm-co|kterm with ANSI colors,
@@ -32241 +39767 @@
 +# title bar. [I have translated it to terminfo -- ESR]
 +xterm-pcolor|xterm with color used for highlights and status line,
++       wsl#40,
 +       bold=\E[1;43m, rev=\E[7;34m,
 +       sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1%t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m,
@@ -32247 +39774 @@
  # This describes the capabilities of color_xterm, an xterm variant from
  # before ECMA-64 color support was folded into the main-line xterm release.
-@@ -3729,6 +3909,32 @@
+@@ -3729,6 +3925,32 @@
         ncv@,
         op=\E[m, use=xterm-r6, use=klone+color,
@@ -32280 +39807 @@
  gnome-rh62|Gnome terminal,
         bce,
-@@ -3867,6 +4073,7 @@
+@@ -3782,7 +4004,7 @@
+ #
+ # bce and msgr are repaired.
+ gnome-rh90|GNOME Terminal,
+-       bce, msgr,
++       bce, msgr, XT,
+        hpa=\E[%i%p1%dG, kDC=\E[3;2~, kLFT=\EO2D, kRIT=\EO2C,
+        kb2=\E[E, kcbt=\E[Z, kend=\EOF, khome=\EOH, tbc=\E[3g,
+        vpa=\E[%i%p1%dd, use=xterm+pcf0, use=xterm+pcfkeys,
+@@ -3867,6 +4089,7 @@
  xfce|Xfce Terminal,
         use=vte,
@@ -32288 +39824 @@
  #
  # This does not use VTE, and does have different behavior (compare xfce and
-@@ -3874,6 +4081,7 @@
+@@ -3874,6 +4097,7 @@
  mgt|Multi GNOME Terminal,
         indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333,
@@ -32296 +39832 @@
  # or not is debatable).
  kvt|KDE terminal,
-@@ -3972,6 +4180,7 @@
+@@ -3922,7 +4146,7 @@
+        ncv@,
+        bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h,
+        ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
+-       hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1@,
++       hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1=\E[3~,
+        kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@,
+        kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@,
+        kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT, rmam=\E[?7l,
+@@ -3932,11 +4156,10 @@
+        sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
+        use=ecma+color, use=xterm-r6,
+ konsole-linux|KDE console window with linux keyboard,
+-       kdch1=\E[3~, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
+-       kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@,
+-       kf2=\E[[B, kf20@, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+-       kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-       use=konsole-base,
++       kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@,
++       kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\E[[B, kf20@,
++       kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
++       kf8=\E[19~, kf9=\E[20~, use=konsole-base,
+ konsole-solaris|KDE console window with Solaris keyboard,
+        kbs=^H, kend=\E[4~, khome=\E[1~, use=konsole-vt100,
+ # KDE's "XFree86 3.x.x" keyboard is based on reading the xterm terminfo rather
+@@ -3972,6 +4195,7 @@
  konsole-256color|KDE console window with xterm 256-colors,
         initc@, use=xterm+256color, use=konsole,
@@ -32304 +39865 @@
  #
  # It is nominally a vt102 emulator, with features borrowed from rxvt and
-@@ -4037,6 +4246,7 @@
+@@ -4037,6 +4261,7 @@
  mlterm-256color|mlterm 3.0 with xterm 256-colors,
         use=xterm+256color, use=rxvt,
@@ -32312 +39873 @@
  # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
  # Notes:
-@@ -4208,6 +4418,7 @@
+@@ -4208,6 +4433,7 @@
  rxvt-16color|xterm with 16 colors like aixterm,
         ncv#32, use=ibm+16color, use=rxvt,
@@ -32320 +39881 @@
  #
  # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
-@@ -4225,6 +4436,7 @@
+@@ -4225,6 +4451,7 @@
  mrxvt-256color|multitabbed rxvt with 256 colors,
         use=xterm+256color, use=mrxvt,
@@ -32328 +39889 @@
  #
  # Eterm 0.9.3
-@@ -4270,11 +4482,13 @@
+@@ -4270,11 +4497,13 @@
  Eterm-88color|Eterm with 88 colors,
         use=xterm+88color, use=Eterm,
@@ -32342 +39903 @@
  # This is not based on xterm's source...
  # vttest shows several problems with keyboard, cursor-movements.
-@@ -4283,48 +4497,8 @@
+@@ -4283,48 +4512,8 @@
         km@,
         kbs=\177, kdch1=\E[3~, use=klone+color, use=xterm-r6,
@@ -32392 +39953 @@
  # from BSD termcap.  (hpterm:  added empty <acsc>, we have no idea what ACS
  # chars look like --esr)
-@@ -4357,31 +4531,7 @@
+@@ -4357,31 +4546,7 @@
         initp=\E&v%p2%da%p3%db%p4%dc%p5%dx%p6%dy%p7%dz%p1%dI,
         op=\E&v0S, scp=\E&v%p1%dS, use=hpterm,
@@ -32425 +39986 @@
  # It corresponds to emu's internal emulation:
  #      emu -term emu
-@@ -4443,6 +4593,8 @@
+@@ -4443,6 +4608,8 @@
         sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
         sgr0=\E[m, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
@@ -32434 +39995 @@
  # print interface, ANSI X3.64 colour escape sequences, etc.  Newsgroup postings
  # indicate that it emulates more than one terminal, but incompletely.
-@@ -4477,7 +4629,7 @@
+@@ -4477,7 +4644,7 @@
         smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
         tsl=\E[?E\E[?%i%p1%dT, use=vt100+fnkeys,
@@ -32443 +40004 @@
  # This application is available by email from <mouse@Rodents.Montreal.QC.CA>.
  #
-@@ -4598,6 +4750,123 @@
+@@ -4598,6 +4765,123 @@
         kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
         khome=\E[1~, knp=\E[6~, kpp=\E[5~, use=mgr,
@@ -32475 +40036 @@
 +       cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
 +       cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-+       dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H,
-+       hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL,
-+       il1=\E[L, ind=^J, indn=\E[%p1%dS, kbs=\177, kcub1=\E[D,
-+       kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
-+       kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-+       kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
-+       kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++       dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
++       home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
++       il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, kbs=\177,
++       kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++       kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
++       kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
++       kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 +       khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8,
 +       rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7,
@@ -32493 +40054 @@
 +st-256color|simpleterm with 256 colors,
 +       ccc@,
-+       initc@, use=simpleterm, use=xterm+256color,
++       initc@, use=xterm+256color, use=simpleterm,
 +
 +### TERMINATOR
@@ -32567 +40128 @@
  #
  
-@@ -5064,10 +5333,10 @@
+@@ -4780,7 +5064,7 @@
+        bce@, bw,
+        invis@, kIC@, kNXT@, kPRV@, meml@, memu@,
+        sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m,
+-       use=screen+fkeys, use=xterm-new,
++       E3@, use=screen+fkeys, use=xterm-new,
+ # xterm-r6 does not really support khome/kend unless it is propped up by
+ # the translations resource.
+ screen.xterm-r6|screen customized for X11R6 xterm,
+@@ -4920,18 +5204,18 @@
+ # sequences for setting the window-title.  So you must use tsl and fsl in
+ # pairs, since the latter ends the string that is loaded to the window-title.
+ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in vt220-8 mode,
+-       am, hs, km, mir, msgr, xenl,
++       am, km, mir, msgr, xenl,
+        acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+        clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
+        csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+        cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+        cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+-       dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+-       dsl=\E]0;\007, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+-       flash=\E[?5h\E[?5l, fsl=^G, home=\E[H, ht=^I, hts=\EH,
+-       ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
+-       il=\E[%p1%dL, il1=\E[L, ind=\n$<150*>,
++       dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
++       el=\E[K, el1=\E[1K, enacs=\E)0, flash=\E[?5h\E[?5l,
++       home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
++       if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L,
++       ind=\n$<150*>,
+        is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>, kbs=^H,
+        kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+        kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~,
+@@ -4945,8 +5229,8 @@
+        rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>, sc=\E7,
+        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
+        sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7,
+-       smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]0;,
+-       u8=\E[?62;1;6c, use=ansi+enq,
++       smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++       u8=\E[?62;1;6c, use=xterm+sl, use=ansi+enq,
+ ncsa|NCSA Telnet 2.7 for Macintosh in vt220-8 mode,
+        use=ncsa-m, use=klone+color,
+ ncsa-ns|NCSA Telnet 2.7 for Macintosh in vt220-8 mode,
+@@ -5064,10 +5348,10 @@
         kf10=\E[233z, kf11=\E[234z, kf12=\E[235z, kf2=\E[225z,
         kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z,
@@ -32582 +40188 @@
  # flake out on the last line.  Unfortunately, without them the terminal has no
  # way to scroll.
-@@ -5131,10 +5400,11 @@
+@@ -5077,6 +5361,10 @@
+ sun|sun1|sun2|Sun Microsystems Inc. workstation console,
+        use=sun-il,
+ 
++sun+sl|Sun Workstation window status line,
++       hs,
++       dsl=\E]l\E\\, fsl=\E\\, tsl=\E]l,
++
+ # From: <john@ucbrenoir>  Tue Sep 24 13:14:44 1985
+ sun-s|Sun Microsystems Workstation window with status line,
+        hs,
+@@ -5131,10 +5419,11 @@
  sun-color|Sun Microsystems Workstation console with color support (IA systems),
         colors#8, ncv#3, pairs#64,
@@ -32596 +40213 @@
  
  #### Iris consoles
-@@ -5405,7 +5675,7 @@
+@@ -5405,7 +5694,7 @@
  #### Non-Unix Consoles
  #
@@ -32605 +40222 @@
  # Also (possibly only EMX, so we don't put it in ansi.sys, etc): set the
  # no_color_video to inform the application that standout(1), underline(2)
-@@ -5544,7 +5814,7 @@
+@@ -5544,7 +5833,7 @@
         rmacs=\E[10m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l,
         rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
@@ -32614 +40231 @@
         smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];,
         vpa=\E[%i%p1%dd, use=vt102+enq,
-@@ -5579,7 +5849,7 @@
+@@ -5579,7 +5868,7 @@
         rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, rmir=\E[4l,
         rmso=\E[m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
@@ -32623 +40240 @@
         smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
  
-@@ -5825,7 +6095,7 @@
+@@ -5825,7 +6114,7 @@
         ht=^I, hts=\EH$<2/>, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H,
         kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
@@ -32632 +40249 @@
         rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
         sgr0=\E[m$<2/>, smso=\E[7m$<2/>, smul=\E[4m$<2/>,
-@@ -5968,7 +6238,7 @@
+@@ -5968,7 +6257,7 @@
  #      :cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
  #      :XU=^Aq\r:XD=^Ar\r:XR=^As\r:XL=^At\r:\
@@ -32641 +40258 @@
         blink=\E[5p, ri=\EM, sgr0=\E[p, use=altos2,
  altos4|alt4|altos-4|altos IV,
-@@ -8212,8 +8482,8 @@
+@@ -6183,7 +6472,7 @@
+        da, db,
+        lm#0, pb#19200,
+        ed=\ED\EJ$<500>\EC, indn=\E&r%p1%dD, ip=$<4>,
+-       is2=\E&j@\r, rin=\E&r%p1%dU, use=hp+pfk+cr,
++       is2=\E&j@\r, rin=\E&r%p1%dU, use=hp+pfk-cr,
+        use=hp+labels, use=scrhp,
+ 
+ # This entry is for sysline. It allocates a 23 line window with
+@@ -6384,7 +6673,7 @@
+ hp2622|hp2622a|hp 2622,
+        da, db,
+        lm#0, pb#19200,
+-       is2=\E&dj@\r, use=hp+pfk+cr, use=hp+labels, use=scrhp,
++       is2=\E&dj@\r, use=hp+pfk-cr, use=hp+labels, use=scrhp,
+ 
+ # The 2623 is a 2622 with extra graphics hardware.
+ hp2623|hp2623a|hp 2623,
+@@ -7088,6 +7377,9 @@
+ # What seems to be going on here is that this entry was designed so that
+ # the normal highlight is bold and standout is dim plus something else
+ # (reverse-video maybe?  But then, are there two <rev> sequences?)
++#
++# Added kdch1, kil1, kdl1 based on screenshot -TD:
++#      http://www.vintagecomputer.net/qume/qvt-108/qume_qvt-108_keyboard.jpg
+ qvt101+|qvt101p|qume qvt 101 PLUS product,
+        am, bw, hs, ul,
+        cols#80, lines#24, xmc#0,
+@@ -7096,11 +7388,11 @@
+        dch1=\EW, dl1=\ER, dsl=\Eg\Ef\r, ed=\EY, el=\ET,
+        flash=\Eb$<200>\Ed, fsl=^M, home=^^, ht=^I, hts=\E1,
+        ich1=\EQ, il1=\EE, ind=^J, invis@, kbs=^H, kcbt=\EI, kcub1=^H,
+-       kcud1=^J, kcuf1=^L, kcuu1=^K, kdl1=\ER, ked=\EY, kel=\ET,
+-       kf1=^A@\r, kf10=^AI\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r,
+-       kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r,
+-       khome=^^, kich1=\EQ, kil1=\EE, mc4=\EA, mc5=\E@, rmso=\E(,
+-       smso=\E0P\E), tbc=\E3, tsl=\Eg\Ef, use=adm+sgr,
++       kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY,
++       kel=\ET, kf1=^A@\r, kf10=^AI\r, kf2=^AA\r, kf3=^AB\r,
++       kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r,
++       kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, mc4=\EA, mc5=\E@,
++       rmso=\E(, smso=\E0P\E), tbc=\E3, tsl=\Eg\Ef, use=adm+sgr,
+ qvt102|qume qvt 102,
+        cnorm=\E., use=qvt101,
+ # (qvt103: added <rmam>/<smam> based on init string -- esr)
+@@ -8212,8 +8504,8 @@
         rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
         rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=13.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee \Ex0\0\0\Ex1\0\0\Ex2\0\0\Ex3\0\0\Ex4\0\0\E1,
@@ -32652 +40314 @@
         tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0,
  
-@@ -9980,7 +10250,7 @@
+@@ -9980,7 +10272,7 @@
         pln=\E[%p1%d;00q%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
         rmacs=^O, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
@@ -32661 +40323 @@
         tsl=\E7\E[25;%p1%{1}%+%dH,
  
-@@ -10078,7 +10348,7 @@
+@@ -10078,7 +10370,7 @@
         pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV,
         rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l,
@@ -32670 +40332 @@
         smkx=\E[19;1j\E[21;4j\Eent, smln=\E~, tbc=\E[3g,
         tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
-@@ -10284,7 +10554,7 @@
+@@ -10284,7 +10576,7 @@
         rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l,
         rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|,
@@ -32679 +40341 @@
         smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m,
         smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH,
-@@ -10681,7 +10951,7 @@
+@@ -10681,7 +10973,7 @@
         ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l,
         rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
@@ -32688 +40350 @@
         smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
         tsl=\E7\E[25;%i%p1%dx,
-@@ -10741,7 +11011,7 @@
+@@ -10741,7 +11033,7 @@
         mc5=\E[?5i, nel=^M^J, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
         rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmir=\E[4l, rmso=\E[m,
@@ -32697 +40359 @@
  att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
         lines#24, use=att630,
-@@ -11391,7 +11661,7 @@
+@@ -11391,7 +11683,7 @@
         rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
         rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\\,
@@ -32706 +40368 @@
         smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\,
         smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-@@ -11401,13 +11671,13 @@
+@@ -11401,13 +11693,13 @@
         blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
         is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m,
@@ -32722 +40384 @@
  aaa-18|ann arbor ambassador/18 lines,
         lines#18,
-@@ -11574,7 +11844,7 @@
+@@ -11574,7 +11866,7 @@
         blink=\E[5;7m, bold=\E[1;7m, home=\E[H, invis=\E[7;8m,
         is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m,
@@ -32731 +40393 @@
  
  #### Applied Digital Data Systems (adds)
-@@ -12478,10 +12748,11 @@
+@@ -12416,7 +12708,7 @@
+ #       and mc5= should use the \E[?4i and \E[?5i strings instead).
+ 
+ hds200|Human Designed Systems HDS200,
+-       am, bw, eslok, hs, km, mc5i, mir, msgr, xenl, xon,
++       am, bw, eslok, hs, km, mir, msgr, xenl, xon,
+        cols#80, it#8, lines#24, lm#0,
+        acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
+        blink=\E[0;5m, bold=\E[0;1m, cbt=\E[Z, civis=\E[6+{,
+@@ -12445,13 +12737,12 @@
+        kf51=^\051\r, kf52=^\052\r, kf53=^\053\r, kf6=^\006\r,
+        kf7=^\007\r, kf8=^\008\r, kf9=^\009\r, khome=\E[H,
+        kind=\E[T, knp=\E[U, kpp=\E[V, kri=\E[S, ll=\E[H\E[A,
+-       mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\E[E, rc=\E8,
+-       rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[m\017,
+-       rmul=\E[m\017, sc=\E7,
++       nel=\E[E, rc=\E8, rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l,
++       rmso=\E[m\017, rmul=\E[m\017, sc=\E7,
+        sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+        sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m,
+        smul=\E[0;4m, tbc=\E[3g, tsl=\E[2!w\E[%i%p1%dG,
+-       vpa=\E[%i%p1%dd,
++       vpa=\E[%i%p1%dd, use=ansi+pp,
+ 
+ # <ht> through <el> included to specify padding needed in raw mode.
+ # (avt-ns: added empty <acsc> to suppress a tic warning --esr)
+@@ -12478,10 +12769,11 @@
         ri=\EM$<4>, rmacs=\016$<1>, rmcup=\E[w\E2\r\n,
         rmir=\E[4l, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, rmul=\E[4!{,
@@ -32747 +40435 @@
         flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
         use=avt-ns,
-@@ -12763,7 +13034,6 @@
+@@ -12763,7 +13055,6 @@
  # backspace on all terminals.  This is not so in DG mode.
  # (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the
@@ -32755 +40443 @@
         OTbs, am, msgr, ul,
         cols#80, it#8, lines#24,
-@@ -12774,10 +13044,12 @@
+@@ -12774,10 +13065,12 @@
         kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
         kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z,
@@ -32772 +40460 @@
  # Data General 605x
  # Ought to work for a Model 6242, Type D210 as well as a 605x.
-@@ -13757,7 +14029,7 @@
+@@ -12824,7 +13117,7 @@
+        cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ed=\E[J, el=\E[K,
+        el1=\E[1K, home=\E[H, ind=^J, is1=\E[<0;<1;<4l,
+        ll=\E[H\E[A, nel=^J, rev=\E[7m, rmso=\E[m, rmul=\E[m,
+-       sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m,
++       sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|%p6%|%t7;%;m,
+        sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=dgkeys+7b,
+ 
+ # DASHER D210 series terminals in DG mode.
+@@ -13026,7 +13319,7 @@
+        is2=\E[3;2;2;1;1;1v\E(B\E)4\017, mc4=\E[4i, mc5=\E[5i,
+        ri=\EM, rmacs=\E)4\017, rs1=\Ec\E[<2h,
+        rs2=\E[4;0;2;1;1;1v\E(B\E)4,
+-       sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m\E)%?%p9%t6\016%e4\017%;,
++       sgr=\E[%?%p1%t2;7%;%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p1%p5%|%t2;%;%?%p6%t4;7;%;m\E)%?%p9%t6\016%e4\017%;,
+        sgr0=\E[m\E)4\017, smacs=\E)6\016, use=d211,
+ 
+ # Initialization string 2 sets:
+@@ -13196,12 +13489,12 @@
+ #
+ d470c|d470|Data General DASHER D470C,
+        is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+-       sgr=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;,
++       sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;,
+        use=dg+color, use=d460,
+ 
+ d470c-7b|d470-7b|Data General DASHER D470C in 7 bit mode,
+        is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+-       sgr=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm%?%p9%t\016%e\017%;,
++       sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;,
+        use=dg+color, use=d460-7b,
+ 
+ # Initialization string 2 sets:
+@@ -13757,7 +14050,7 @@
  sb2|sb3|fixed superbee,
         xsb@, use=superbee,
@@ -32781 +40502 @@
  # Steve Seymour <srseymour@mindspring.com> writes (Wed, 03 Feb 1999):
  # Regarding your question though; Beehive terminals weren't made by Harris.
-@@ -14578,7 +14850,7 @@
+@@ -14224,6 +14517,8 @@
+        sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+        sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+        tbc=\E[3g,
++# "Megapel" refers to the display adapter, which was used with the IBM RT
++# aka IBM 6150.
+ ibm5081|hft|IBM Megapel Color display,
+        acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B,
+        s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
+@@ -14578,7 +14873,7 @@
         is1=\EC\E.3\EDF\EV1\Eg\E[0ZZ, nel=^_, rev=\E[4ZZ,
         rmir=\Er, rmso=\E[%gh%{4}%^%Ph%gh%dZZ,
@@ -32790 +40520 @@
  icl6404-w|kds7372-w|ICL 6404 aka Kokusai Display Systems 7372 132 cols,
         rs2=\Eo1, use=icl6404,
-@@ -14916,7 +15188,7 @@
-        ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+@@ -14895,7 +15190,7 @@
+ # (esr: commented out <smacs>/<rmacs> because there's no <acsc>)
+ #
+ prism9|p9|P9|MDC Prism-9 in ANSII mode,
+-       am, bw, hs, mc5i, msgr, xenl, xon,
++       am, bw, hs, msgr, xenl, xon,
+        cols#80, it#8, lines#24, vt#3, wsl#72,
+        bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[<4l,
+        clear=^L, cnorm=\E[<4h, cr=^M, csr=\E[%i%p1%d;%p2%d%%v,
+@@ -14911,14 +15206,15 @@
+        kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
+        kf18=\E[32~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+        kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-       khome=\E[H, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=^M^J,
+-       prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c, rev=\E[7m,
+-       ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++       khome=\E[H, nel=^M^J, prot=\E[32%{, rc=\E[%z,
++       rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l,
++       rmso=\E[27m, rmul=\E[24m,
         rs2=\E[&p\E[<12l\E F\E[3g\E[9;17;25;33;41;49;57;65;73 N,
         sc=\E[%y,
@@ -32798 +40545 @@
         sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
         tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
- 
-@@ -15282,7 +15554,7 @@
++       use=ansi+pp,
+ 
+ # p9-w: Prism-9 in 132 column mode
+ # --------------------------------
+@@ -15282,7 +15578,7 @@
         rmkx=\E[?1l\E>, rmso=\E[0m, rmul=\E[0m,
         rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
@@ -32808 +40558 @@
         smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g,
         tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, use=vt220+keypad,
-@@ -15339,7 +15611,7 @@
+@@ -15339,7 +15635,7 @@
         rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
         rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
@@ -32817 +40567 @@
         smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
         tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>,
-@@ -15395,7 +15667,7 @@
+@@ -15395,7 +15691,7 @@
         rmul=\E[24m,
         rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
@@ -32826 +40576 @@
         smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
         tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>,
-@@ -17752,6 +18024,23 @@
+@@ -15785,7 +16081,7 @@
+ # Manufactured in the early/mid eighties, behaves almost the same as a
+ # Televideo 950.  Take a 950, change its cabinet for a more 80s-ish one (but
+ # keep the same keyboard layout), add an optional 25-line mode, replace the DIP
+-# switches with a menu and remove the "lock line" feature (ESC !  1 and ESC ! 
++# switches with a menu and remove the "lock line" feature (ESC !  1 and ESC !
+ # 2), here is the NDR 9500.  Even the line-lock, albeit disabled, is
+ # recognized:  if you type in "ESC !", the next (third) character is not
+ # echoed, showing that the terminal was actually waiting for a parameter!
+@@ -15809,7 +16105,7 @@
+        pfloc=\E|%{48}%p1%+%c2%p2\031,
+        pfx=\E|%{48}%p1%+%c1%p2\031, prot=\E), ri=\Ej,
+        rmacs=\E%%, rmir=\Er, rmso=\E(, rmxon=^N,
+-       sgr=\E%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;,
++       sgr=\EG0\E%%%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;,
+        sgr0=\EG0\E%%\E(, smacs=\E$, smir=\Eq, smso=\E), smxon=^O,
+        tbc=\E3, tsl=\Eg\Ef\011%p1%{32}%+%c, .kbs=^H,
+ 
+@@ -16279,7 +16575,7 @@
+        kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
+        rev=\E%!1\E[7m$<2>\E%!0, ri=\EI,
+        rmso=\E%!1\E[m$<2>\E%!0, rmul=\E%!1\E[m$<2>\E%!0,
+-       sgr=\E%%!1\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>\E%%!0,
++       sgr=\E%%!1\E[%?%p1%t;7;5%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t<0%;%?%p6%t;1%;m$<2>\E%%!0,
+        sgr0=\E%!1\E[m$<2>\E%!0, smso=\E%!1\E[7;5m$<2>\E%!0,
+        smul=\E%!1\E[4m$<2>\E%!0,
+ # Tektronix 4207 with sysline.  In the ancestral termcap file this was 4107-s;
+@@ -16466,9 +16762,10 @@
+        clear=\E[2J\E[H, cr=^M, cub=\E[%p1%dD, cub1=\E[D,
+        cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
+        cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+-       dch1=\E[1P, dim=\E[=1;<6m, dl1=\E[1M, ech=\E%p1%dX,
+-       ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I,
+-       ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
++       dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M,
++       ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
++       home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L,
++       ind=\ED,
+        initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3%e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=%t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<%tA?%e%p2%{500}%<%tC8%e%p2%{625}%<%tD4%e%p2%{750}%<%tE1%e%p2%{875}%<%tE\:%eF4%;%?%p3%{125}%<%t0%e%p3%{250}%<%tA2%e%p3%{375}%<%tA?%e%p3%{500}%<%tC8%e%p3%{625}%<%tD4%e%p3%{750}%<%tE1%e%p3%{875}%<%tE\:%eF4%;%?%p4%{125}%<%t0%e%p4%{250}%<%tA2%e%p4%{375}%<%tA?%e%p4%{500}%<%tC8%e%p4%{625}%<%tD4%e%p4%{750}%<%tE1%e%p4%{875}%<%tE\:%eF4%;\E%%!1,
+        invis=\E[=6;<5, is1=\E%!0\ETM1\E%!1\E[m, kbs=^H,
+        kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOA,
+@@ -16639,7 +16936,7 @@
+        kf9=\250, khome=\E[H, kich1=\E[^H, knp=\E[U, kpp=\E[V,
+        ll=\E[24;1H, nel=^M, rev=\E[7m, ri=\E[T\E[A,
+        rin=\E[%p1%dT\E[%p1%dA, rmso=\E[m, rmul=\E[m,
+-       sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
++       sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t30;40%;m,
+        sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+ 
+ #### Apple II
+@@ -16885,6 +17182,8 @@
+ #
+ #     echo "$TERM_PROGRAM" "$TERM_PROGRAM_VERSION"
+ #
++# For Apple_Terminal v309+, use "nsterm-256color" (or "nsterm-bce")
++#
+ # For Apple_Terminal v200+, use "nsterm-16color" (a.k.a. "nsterm")
+ #
+ # For Apple_Terminal v71+/v100+, use "nsterm-bce".
+@@ -17101,6 +17400,7 @@
+        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+        sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+ 
++# compare with xterm+sl-twm
+ nsterm+s|AppKit Terminal.app v41+ status-line (window titlebar) support,
+        hs,
+        wsl#50,
+@@ -17186,6 +17486,10 @@
+ # and it is still not settable from the preferences dialog. This is
+ # tracked under rdar://problem/7365108 and rdar://problem/7365134
+ # in Apple's bug reporter.
++#
++# In OS X 10.7 (Leopard) the TERM which can be set in the preferences dialog
++# defaults to xterm-color.  Alternative selections are ansi, dtterm, rxvt,
++# vt52, vt100, vt102 and xterm.
+ nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
+        bw@, mir, npc,
+        civis=\E[?25l, cnorm=\E[?25h, dch=\E[%p1%dP, dch1=\E[P,
+@@ -17197,10 +17501,10 @@
+        kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+        knp=\E[6~, kpp=\E[5~, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l,
+        smcup=\E7\E[?47h, smir=\E[4h, vpa=\E[%i%p1%dd,
+-       use=nsterm-c-s-acs,
++       kLFT5=\E[5D, kRIT5=\E[5C, use=nsterm-c-s-acs,
+ 
+ # The versions of Terminal.app in Mac OS X version 10.3.x seem to have
+-# the background color erase bug. The newer version 240.2 in Mac OS X
++# the background color erase feature. The newer version 240.2 in Mac OS X
+ # version 10.5 does not.
+ #
+ # This entry is based on newsgroup comments by Alain Bench, Christian Ebert,
+@@ -17212,12 +17516,40 @@
+ #      defaults write com.apple.Terminal TermCapString nsterm-bce
+ #
+ # and that it is not set in Terminal's preferences dialog.
++#
++# Modified for OS X 10.8, omitting bw based on testing with tack -TD
++#
++# Notes:
++# * The terminal description matches the default settings.
++# * The keyboard is configurable via a dialog.
++# * By default khome, kend, knext and kprev are honored only with a
++#   shift-modifier.
++# * There are bindings for control left/right arrow (but not up/down).
++#   Added those to nsterm-16color, which is the version used for OS X 10.6
++# * "Allow VT100 application keypage mode" is by default disabled.
++#   There is no way to press keypad-comma unless application mode is enabled
++#   and used.
++# * 132-column mode stopped working during vttest's tests.  Consider it broken.
++# * CHT, REP, SU, SD are buggy.
++# * ECH works (also in Leopard), but is not used here for compatibility.
++# * The terminal preferences dialog replaces xterm-color by xterm-16color and
++#   xterm-256color.  However, it adds "nsterm", so it is possible to use the
++#   nsterm entry from this file to override the MacPorts (20110404) or
++#   system (20081102) copy of this file.
+ nsterm-bce|AppKit Terminal.app v71+/v100.1.8+ with Mac OS X version 10.3/10.4 (bce),
+-       bce, bw, use=nsterm-16color,
++       bce, use=nsterm-16color,
++
++# This is tested with OS X 10.8 (Mountain Lion), 2012/08/11
++#      TERM_PROGRAM_VERSION=309
++# Earlier reports state that these differences also apply to OS X 10.7 (Lion),
++#      TERM_PROGRAM_VERSION=303
++nsterm-256color|Terminal.app in OS X 10.8,
++       ccc@,
++       initc@, use=xterm+256color, use=nsterm-bce,
+ 
+ # This is an alias which should always point to the "current" version
+ nsterm|Apple_Terminal|AppKit Terminal.app,
+-       use=nsterm-16color,
++       use=nsterm-256color,
+ 
+ # iTerm.app from http://iterm.sourceforge.net/ is an alternative (and
+ # more featureful) terminal emulator for Mac OS X. It is similar
+@@ -17752,6 +18084,23 @@
  # See
  #      http://www.minix3.org/manpages/man4/console.4.html
@@ -32850 +40734 @@
  
  # See
-@@ -17792,7 +18081,7 @@
+@@ -17792,7 +18141,7 @@
         am, use=minix-old,
  
@@ -32859 +40743 @@
  # According to the Coherent 2.3 manual, the PC console is similar
  # to a z19. The differences seem to be (1) 25 lines, (2) no status
-@@ -21014,8 +21303,8 @@
+@@ -18195,6 +18544,7 @@
+        use=tws-generic,
+ dku7202|BULL Questar 200 DKU7202 (colour/character attributes),
+        blink=\E[0;2;4m, dim=\E[0;5m, ht=^I, is3=\E[?3h\Eb,
++       sgr=\E[0%?%p1%t;2;4;5;7%;%?%p3%t;7%;%?%p2%t;2%;%?%p4%t;2;4%;%?%p5%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+        smso=\E[0;4;5;7m, smul=\E[0;2m, use=tws-generic,
+ 
+ #=========================================================#
+@@ -18274,7 +18624,7 @@
+ 
+ # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310
+ bq300|Bull vt320 ISO Latin 1 80 columns terminal,
+-       am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon,
++       am, eo, eslok, hs, km, mir, msgr, xenl, xon,
+        cols#80, it#8, lines#24, vt#3, wsl#80,
+        acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+        bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+@@ -18298,14 +18648,14 @@
+        kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
+        khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+        krdo=\E[29~, kslt=\E[4~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+-       mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m,
+-       ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l,
+-       rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[!p,
+-       rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, sc=\E7,
++       nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
++       rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
++       rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
++       sc=\E7,
+        sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;,
+        sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
+        smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
+-       smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~,
++       smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, use=ansi+pp,
+ bq300-rv|Bull vt320 reverse 80 columns,
+        flash=\E[?5l$<50>\E[?5h,
+        is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
+@@ -18383,12 +18733,12 @@
+        csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=\2331D,
+        cud=\233%p1%dB, cud1=\2331B, cuf=\233%p1%dC, cuf1=\2331C,
+        cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\2331A,
+-       dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM,
++       dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, dl1=\233M,
+        dsl=\2331$}\2332$~\n\2330$}, ech=\233%p1%dX, ed=\233J,
+        el=\233K, el1=\2331K, enacs=\E(B\E)0,
+        flash=\233?5h$<50>\233?5l, fsl=\2330$}, home=\233H,
+-       ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, ind=\ED,
+-       is1=\E[63;2"p\E[2h,
++       ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L,
++       ind=\ED, is1=\E[63;2"p\E[2h,
+        is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
+        is3=\2330$}\233?25h\2332l\233H\233J, ka1=\217w,
+        ka3=\217y, kb2=\217u, kbs=^H, kc1=\217q, kc3=\217s,
+@@ -18401,11 +18751,12 @@
+        khlp=\23328~, kich1=\2332~, knp=\2336~, kpp=\2335~,
+        krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3,
+        lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8,
+-       rev=\2337m, ri=\EM, rmacs=^O, rmam=\233?7l, rmcup=\233?7h,
+-       rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m,
+-       rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, sc=\E7,
++       rev=\2337m, ri=\EM, rmacs=\E(B, rmam=\233?7l,
++       rmcup=\233?7h, rmir=\2334l, rmkx=\233?1l\E>,
++       rmso=\23327m, rmul=\23324m, rs1=\E[!p, rs2=\E[?3l,
++       s0ds=\E(B, s1ds=\E(0, sc=\E7,
+        sgr=\233%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;,
+-       sgr0=\2330m\E(B, smacs=^N, smam=\233?7h,
++       sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h,
+        smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m,
+        smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~,
+ bq300-8rv|Bull vt320 8-bit reverse mode 80 columns,
+@@ -19010,14 +19361,14 @@
+        cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+        cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+        dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
+-       dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l, home=\E[H,
+-       ht=^I, hts=\EH, if=/usr/share/tabset/vt100, il=\E[%p1%dL,
+-       ind=\ED, kbs=^H, kclr=\E[J, kcub1=\EOD, kcud1=\EOB,
+-       kcuf1=\EOC, kcuu1=\EOA, ked=\E[J, kf0=\E[~, kf1=\EOS,
+-       kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ,
+-       kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7,
+-       nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM, rmcup=\E[?7h,
+-       rmso=\E[m, rmul=\E[m,
++       dl1=\E[M, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l,
++       home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100,
++       il=\E[%p1%dL, il1=\E[L, ind=\ED, kbs=^H, kclr=\E[J,
++       kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, ked=\E[J,
++       kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW,
++       kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
++       mc0=\E#7, nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM,
++       rmcup=\E[?7h, rmso=\E[m, rmul=\E[m,
+        rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m,
+        sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m,
+        tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K,
+@@ -20217,9 +20568,9 @@
+        sgr0=\EX, smacs=\EF, smso=\ET,
+ env230|envision230|envision 230 graphics terminal,
+        xenl@,
+-       mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+-       sgr=\E[%?%p1%t;1%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>,
+-       use=vt100,
++       enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@,
++       sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>,
++       sgr0=\E[0m$<2>, smacs@, use=vt100,
+ # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic
+ # coupler attached, the whole rig fitting in a suitcase and more or less
+ # portable.  Hot stuff for c.1977 :-) -- esr
+@@ -20274,7 +20625,7 @@
+        rmacs=\EH^C, rmam=\Ed., rmcup=, rmir=\Er, rmln=\EA11,
+        rmxon=\Ec20, rs1=\E~!\E~4$<150>, rs2=\EeF$<150>,
+        rs3=\EwG\Ee($<150>,
+-       sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++       sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
+        sgr0=\E(\EH\003\EG0\EcD, smacs=\EH^B, smam=\Ed/,
+        smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177,
+        smir=\Eq, smln=\EA10, smxon=\Ec21, tbc=\E0, tsl=\Ez(,
+@@ -21011,11 +21362,108 @@
+ # CF for civis and CO for cvvis.  Finally, they define a boolean :ct:
+ # that flags color terminals.
+ #
++# Extensions added after ncurses 5.0 generally use the "-x" option of tic and
++# infocmp to manipulate user-definable capabilities.  Those that are intended
++# for use in either terminfo or termcap use 2-character names.  Extended
++# function keys do not use 2-character names, and are available only with
++# terminfo.
++#
++# As of mid-2012, no other terminfo/termcap implementation than ncurses
++# supports this extension; termcap libraries can as noted above make limited
++# use of the feature.
++#
++# ncurses makes explicit checks for a few user-definable capabilities:  AX, U8,
++# XM.
++#
++# SCREEN Extensions:
++#
++# The screen program uses the termcap interface.  It recognizes a few useful
++# nonstandard capabilities.  Those are used in this file.
++#
++#       AX   (bool)  Does  understand  ANSI  set  default fg/bg color (\E[39m /
++#                    \E[49m).
++#       G0   (bool)  Terminal can deal with ISO 2022  font  selection sequences.
++#       E0   (str)   Switch charset 'G0' back to standard charset.
++#       S0   (str)   Switch charset 'G0' to the specified charset.
++#       XT   (bool)  Terminal understands special xterm sequences  (OSC,  mouse
++#                    tracking).
++#
++# AX is relatively straightforward; it is interpreted by ncurses to say that
++# SGR 39/49 reset the terminal's foreground and background colors to their
++# "default".
++#
++# XT is harder, since screen's manpage does not give more details.  For that,
++# we must read screen's source-code.  When XT is set, screen assumes
++#
++# a) OSC 1 sets the title string, e.g., for the icon.  Recent versions of
++#    screen may also set the terminal's name, which is (for xterm) distinct
++#    from the icon name.
++# b) OSC 20 sets the background pixmap.  This is an rxvt feature.
++# c) OSC 39 and OSC 49 set the default foreground/background colors.  Again
++#    this is an rxvt feature.
++# d) certain mode settings enable the mouse: 9, 1000, 1001, 1002, 1003.
++#    These are from xterm, although xterm accepts mouse codes that may not be
++#    recognized by screen, e.g., 1005, 1006.
++# e) colors beyond 0..7 are implemented by xterm's aixterm-like 16-color
++#    sequence.  However, because screen uses only termcap, the values returned
++#    by Af/Ab are not usable because they rely on expressions that termcap
++#    does not support.  Therefore, screen uses a hardcoded string to work
++#    around the limitation.
++# f) all entries named "*xterm*" or "*rxvt*" have the bce flag set.
++#
++# The other ISO-2022 features are rarely used, but provided here to make
++# screen's termcap features available.
++#
++# XTERM Extensions:
++#
++# Most of the xterm extensions are for function-keys.  Since patch #94 (in
++# 1999), xterm has supported shift/control/alt/meta modifiers which produce
++# additional function-key strings.  Some other developers copied the feature,
++# though they did not follow xterm's lead in patch #167 (in 2002), to make
++# these key definitions less ambiguous.
++#
++# A few terminals provide similar functionality (sending distinct keys when
++# a modifier is used), including rxvt.
++#
++# These are the extended keys defined in this file:
++#
++# kDC3 kDC4 kDC5 kDC6 kDC7 kDN kDN3 kDN4 kDN5 kDN6 kDN7 kEND3 kEND4 kEND5 kEND6
++# kEND7 kHOM3 kHOM4 kHOM5 kHOM6 kHOM7 kIC3 kIC4 kIC5 kIC6 kIC7 kLFT3 kLFT4
++# kLFT5 kLFT6 kLFT7 kNXT3 kNXT4 kNXT5 kNXT6 kNXT7 kPRV3 kPRV4 kPRV5 kPRV6 kPRV7
++# kRIT3 kRIT4 kRIT5 kRIT6 kRIT7 kUP kUP3 kUP4 kUP5 kUP6 kUP7 ka2 kb1 kb3 kc2
++#
++# Here are the other xterm-related extensions which are used in this file:
++#
++# Cr is a string capability which resets the cursor color
++# Cs is a string capability which sets the cursor color to a given value.
++#    The single string parameter is the color name/number, according to the
++#    implementation.
++# Ms modifies the selection/clipboard.  Its parameters are
++#      p1 = the storage unit (clipboard, selection or cut buffer)
++#      p2 = the base64-encoded clipboard content.
++# Se resets the cursor style to the terminal power-on default.
++# Ss is a string capability with one numeric parameter.  It is used to set the
++#    cursor style as described by the DECSCUSR function to a block or
++#    underline.
++# XM is a string capability which overrides ncurses's built-in string which
++#    enables xterm mouse mode.
++#
++# Miscellaneous extensions:
++#
++# gsbom/grbom are used to enable/disable real bold (not intensity bright) mode.
++#    This was implemented for the Hurd.
++# E3 clears the terminal's scrollback buffer.  This was implemented in the
++#    Linux 3.0 kernel as a security feature.  It matches a feature which was
++#    added in xterm patch #107.
++# U8 is a numeric capability which denotes a terminal emulator which does not
++#    support VT100 SI/SO when processing UTF-8 encoding.  Set this to a nonzero
++#    value to enable it.
++#
  ######## CHANGE HISTORY
  #
@@ -32870 +40969 @@
  # This file contains all the capability information present in John Kunze's
  # last version of the termcap master file, except as noted in the change
-@@ -21115,7 +21404,7 @@
+@@ -21115,7 +21563,7 @@
  #      * Replaced HP entries up to hpsub with purpose-built ones.
  #      * Blank rmir/smir/rmdc/smdc capabilities removed.
@@ -32879 +40978 @@
  #        more efficient (but the entries otherwise identical).
  #      * Added dg211 from Shuford archive.
-@@ -22224,7 +22513,7 @@
+@@ -22224,7 +22672,7 @@
  #      * add screen.rxvt -TD
  #
@@ -32888 +40987 @@
  # 2008-06-28
  #      * add screen.mlterm -TD
-@@ -22354,6 +22643,68 @@
+@@ -22354,6 +22802,139 @@
  #      * add xterm-utf8 as a demo of the U8 feature -TD
  #
@@ -32956 +41055 @@
 +#      * make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD
 +#      * make sgr for cygwin, cygwinDBG agree with other caps -TD
++#
++# 2012-03-31
++#      * correct order of use-clauses in st-256color -TD
++#
++# 2012-04-01
++#      * revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD
++#
++# 2012-04-14
++#      * document all of the user-defined capabilities in one place -TD
++#      * add XT to some places to improve usefulness for other applications
++#        than screen, which would like to pretend that xterm's title is
++#        a status-line. -TD
++#      * change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review
++#        of ordering and overrides -TD
++#
++# 2012-04-21
++#      * add msgr to vt420, similar DEC vtXXX entries -TD
++#      * add several missing vt420 capabilities from vt220 -TD
++#      * factor out ansi+pp from several entries -TD
++#      * change xterm+sl and xterm+sl-twm to include only the status-line
++#        capabilities and not "use=xterm", making them more generally useful
++#        as building-blocks -TD
++#      * add dec+sl building block, as example -TD
++#
++# 2012-04-28
++#      * fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD
++#      * add eslok flag to dec+sl -TD
++#      * dec+sl applies to vt320 and up -TD
++#      * drop wsl width from xterm+sl -TD
++#      * reuse xterm+sl in putty and nsca-m -TD
++#      * add ansi+tabs to vt520 -TD
++#      * add ansi+enq to vt220-vt520 -TD
++#
++# 2012-05-05
++#      * remove p6 (bold) from opus3n1+ for consistency -TD
++#      * remove acs stuff from env230 per clues in Ingres termcap -TD
++#      * modify env230 sgr/sgr0 to match other capabilities -TD
++#      * modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD
++#      * make sgr for dku7202 agree with other caps -TD
++#      * make sgr for ibmpc agree with other caps -TD
++#      * make sgr for tek4107 agree with other caps -TD
++#      * make sgr for ndr9500 agree with other caps -TD
++#      * make sgr for sco-ansi agree with other caps -TD
++#      * make sgr for d410 agree with other caps -TD
++#      * make sgr for d210 agree with other caps -TD
++#      * make sgr for d470c, d470c-7b agree with other caps -TD
++#
++# 2012-05-12
++#      * rewrite vt520 entry based on vt420 -TD
++#      * corrected 'op' for bterm (report by Samuel Thibault) -TD
++#
++# 2012-06-02
++#      * add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord,
++#        analysis by Martin Husemann).
++#      * add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by
++#        Onno van der Linden).
++#      * add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD
++#      * add kdch1, etc., to qvt108 -TD
++#      * add dl1/il1 to some entries based on dl/il values -TD
++#      * add dl to simpleterm -TD
++#
++# 2012-06-10
++#      * modify some older xterm entries to align with xterm source -TD
++#      * separate "xterm-old" alias from "xterm-r6" -TD
++#
++# 2012-07-28
++#      * add E3 to xterm-basic and putty -TD
++#
++# 2012-08-11
++#      * add nsterm-256color, make this the default nsterm -TD
++#      * remove bw from nsterm-bce, per testing with tack -TD
  #
  ######## SHANTIH!  SHANTIH!  SHANTIH!
+diff -Naur ncurses-5.9.orig/mk-0th.awk ncurses-5.9/mk-0th.awk
+--- ncurses-5.9.orig/mk-0th.awk 2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/mk-0th.awk      2012-08-25 19:58:01.856555996 +0000
+@@ -1,6 +1,6 @@
+-# $Id: mk-0th.awk,v 1.18 2010/01/09 21:45:41 tom Exp $
++# $Id: mk-0th.awk,v 1.22 2012/06/30 20:56:11 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -34,14 +34,62 @@
+ # Variables:
+ #      libname (library name, e.g., "ncurses", "panel", "forms", "menus")
+ #      subsets (is used here to decide if wide-character code is used)
++#      ticlib (library name for libtic, e.g., "tic")
++#      termlib (library name for libtinfo, e.g., "tinfo")
+ #
++function make_lintlib(name,sources) {
++       print  ""
++       print  "clean ::"
++       printf "\trm -f llib-l%s.*\n", name
++       print  ""
++       print  "realclean ::"
++       printf "\trm -f llib-l%s\n", name
++       print  ""
++       printf "llib-l%s : %s\n", name, sources
++       printf "\tcproto -a -l -DNCURSES_ENABLE_STDBOOL_H=0 -DLINT $(CPPFLAGS) %s >$@\n", sources
++       print  ""
++       print  "lintlib ::"
++       printf "\tsh $(srcdir)/../misc/makellib %s $(CPPFLAGS)\n", name
++       print ""
++       print "lint ::"
++       printf "\t$(LINT) $(LINT_OPTS) $(CPPFLAGS) %s $(LINT_LIBS)\n", sources
++}
++
++# A blank in "subsets" indicates a split-off of the library into a separate
++# file, e.g., for libtic or libtinfo.  They are all logical parts of the same
++# library.
++function which_library() {
++       if ( ( which == "ticlib" ) && ( subsets ~ /ticlib / ) ) {
++               return ticlib;
++       } else if ( ( which == "termlib" || which == "ext_tinfo" ) && ( subsets ~ /[[:space:]]base/ ) ) {
++               return termlib;
++       } else {
++               return libname;
++       }
++}
++
++function show_list(name, len, list) {
++       if ( len > 0 ) {
++               printf "\n%s_SRC =", toupper(name);
++               for (n = 0; n < len; ++n)
++                       printf " \\\n\t%s", list[n];
++               print "";
++               make_lintlib(name, sprintf("$(%s_SRC)", toupper(name)));
++       }
++}
++
+ BEGIN  {
+                which = libname;
+                using = 0;
+                found = 0;
++               count_ticlib = 0;
++               count_termlib = 0;
++               count_library = 0;
+        }
+        /^@/ {
+                which = $0;
++               sub(/^@[[:blank:]]+/, "", which);
++               sub(/[[:blank:]]+$/, "", which);
+        }
+        !/^[@#]/ {
+                if (using == 0)
+@@ -50,6 +98,10 @@
+                        print  "# generated by mk-0th.awk"
+                        printf "#   libname:    %s\n", libname
+                        printf "#   subsets:    %s\n", subsets
++                       if ( libname ~ /ncurses/ ) {
++                               printf "#   ticlib:     %s\n", ticlib
++                               printf "#   termlib:    %s\n", termlib
++                       }
+                        print  ""
+                        print  ".SUFFIXES: .c .cc .h .i .ii"
+                        print  ".c.i :"
+@@ -80,9 +132,18 @@
+                                        found = 2
+                        }
+                        if ( libname == "c++" || libname == "c++w" ) {
+-                               printf " \\\n\t%s/%s.cc", $3, $1
++                               srcname = sprintf("%s/%s.cc", $3, $1);
++                               printf " \\\n\t%s", srcname;
+                        } else if ( widechar == 1 || $3 != "$(wide)" ) {
+-                               printf " \\\n\t%s/%s.c", $3, $1
++                               srcname = sprintf("%s/%s.c", $3, $1);
++                               printf " \\\n\t%s", srcname;
++                               if ( which_library() == libname ) {
++                                       list_library[count_library++] = srcname;
++                               } else if ( which_library() == ticlib ) {
++                                       list_ticlib[count_ticlib++] = srcname;
++                               } else {
++                                       list_termlib[count_termlib++] = srcname;
++                               }
+                        }
+                }
+        }
+@@ -91,22 +152,11 @@
+                if ( found == 1 )
+                {
+                        print  ""
+-                       printf "# Producing llib-l%s is time-consuming, so there's no direct-dependency for\n", libname
+-                       print  "# it in the lintlib rule.  We'll only remove in the cleanest setup."
+-                       print  "clean ::"
+-                       printf "\trm -f llib-l%s.*\n", libname
+-                       print  ""
+-                       print  "realclean ::"
+-                       printf "\trm -f llib-l%s\n", libname
+-                       print  ""
+-                       printf "llib-l%s : $(C_SRC)\n", libname
+-                       printf "\tcproto -a -l -DNCURSES_ENABLE_STDBOOL_H=0 -DLINT $(CPPFLAGS) $(C_SRC) >$@\n"
+-                       print  ""
+-                       print  "lintlib :"
+-                       printf "\tsh $(srcdir)/../misc/makellib %s $(CPPFLAGS)", libname
+-                       print ""
+-                       print "lint :"
+-                       print "\t$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(C_SRC) $(LINT_LIBS)"
++                       printf "# Producing llib-l%s is time-consuming, so there's no direct-dependency for\n", libname;
++                       print  "# it in the lintlib rule.  We'll only remove in the cleanest setup.";
++                       show_list(libname, count_library, list_library);
++                       show_list(ticlib, count_ticlib, list_ticlib);
++                       show_list(termlib, count_termlib, list_termlib);
+                }
+                else
+                {
+@@ -115,3 +165,4 @@
+                        print  "\t@echo no action needed"
+                }
+        }
++# vile:ts=4 sw=4
 diff -Naur ncurses-5.9.orig/mk-1st.awk ncurses-5.9/mk-1st.awk
---- ncurses-5.9.orig/mk-1st.awk 2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/mk-1st.awk      2012-02-16 18:25:12.975818378 +0000
+--- ncurses-5.9.orig/mk-1st.awk 2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/mk-1st.awk      2012-08-25 19:58:00.906560490 +0000
 @@ -1,6 +1,6 @@
 -# $Id: mk-1st.awk,v 1.85 2010/08/07 20:42:30 Gabriele.Balducci Exp $
-+# $Id: mk-1st.awk,v 1.87 2011/12/17 20:27:27 tom Exp $
++# $Id: mk-1st.awk,v 1.88 2012/02/25 20:22:09 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
  #                                                                            #
  # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -32978 +41288 @@
  #      ShlibVerInfix ("yes" or "no", determines location of version #)
  #      SymLink           ("ln -s", etc)
-@@ -181,6 +182,11 @@
+@@ -69,7 +70,7 @@
+        }
+ # see imp_name
+ function imp_name_of(a_name) {
+-               if (ShlibVerInfix == "cygdll") {
++               if (ShlibVerInfix == "cygdll" || ShlibVerInfix == "mingw") {
+                        result = sprintf("%s%s%s.a", prefix, a_name, suffix);
+                } else {
+                        result = "";
+@@ -80,6 +81,8 @@
+ function abi_name_of(a_name) {
+                if (ShlibVerInfix == "cygdll") {
+                        result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix);
++               } else if (ShlibVerInfix == "mingw") {
++                       result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix);
+                } else if (ShlibVerInfix == "yes") {
+                        result = sprintf("%s%s.$(ABI_VERSION)%s", prefix, a_name, suffix);
+                } else {
+@@ -91,6 +94,8 @@
+ function rel_name_of(a_name) {
+                if (ShlibVerInfix == "cygdll") {
+                        result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix);
++               } else if (ShlibVerInfix == "mingw") {
++                       result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix);
+                } else if (ShlibVerInfix == "yes") {
+                        result = sprintf("%s%s.$(REL_VERSION)%s", prefix, a_name, suffix);
+                } else {
+@@ -107,7 +112,7 @@
+                } else {
+                        if ( ShlibVer == "rel" ) {
+                                result = rel_name_of(a_name);
+-                       } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) {
++                       } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "mingw" ) {
+                                result = abi_name_of(a_name);
+                        } else {
+                                result = lib_name_of(a_name);
+@@ -148,7 +153,7 @@
+                printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list
+        }
+ function sharedlinks(directory) {
+-               if ( ShlibVer != "auto" && ShlibVer != "cygdll" ) {
++               if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "mingw" ) {
+                        printf "\tcd %s && (", directory
+                        if ( DoLinks == "reverse" ) {
+                                if ( ShlibVer == "rel" ) {
+@@ -181,6 +186,11 @@
                 dst_libs = sprintf("%s/%s", directory, end_name);
                 printf "%s : \\\n", dst_libs
@@ -32990 +41345 @@
                         save_suffix = suffix
                         sub(/^[^.]\./,".",suffix)
-@@ -242,6 +248,7 @@
+@@ -242,6 +252,7 @@
                                         printf "#  prefix:        %s\n", prefix 
                                         printf "#  suffix:        %s\n", suffix 
@@ -32998 +41353 @@
                                         printf "#  ShlibVerInfix: %s\n", ShlibVerInfix 
                                         printf "#  SymLink:       %s\n", SymLink 
+@@ -316,7 +327,7 @@
+                                print  "install \\"
+                                print  "install.libs \\"
+ 
+-                               if ( ShlibVer == "cygdll" ) {
++                               if ( ShlibVer == "cygdll" || ShlibVer == "mingw") {
+ 
+                                        dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)";
+                                        printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs
+@@ -337,7 +348,7 @@
+ 
+                                if ( overwrite == "yes" && name == "ncurses" )
+                                {
+-                                       if ( ShlibVer == "cygdll" ) {
++                                       if ( ShlibVer == "cygdll" || ShlibVer == "mingw") {
+                                                ovr_name = sprintf("libcurses%s.a", suffix)
+                                                printf "\t@echo linking %s to %s\n", imp_name, ovr_name
+                                                printf "\tcd $(DESTDIR)$(libdir) && ("
+@@ -358,7 +369,7 @@
+                                print  "uninstall \\"
+                                print  "uninstall.libs \\"
+                                printf "uninstall.%s ::\n", name
+-                               if ( ShlibVer == "cygdll" ) {
++                               if ( ShlibVer == "cygdll" || ShlibVer == "mingw") {
+ 
+                                        printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name
+                                        printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name
+@@ -371,11 +382,7 @@
+                                        removelinks("$(DESTDIR)$(libdir)")
+                                        if ( overwrite == "yes" && name == "ncurses" )
+                                        {
+-                                               if ( ShlibVer == "cygdll" ) {
+-                                                       ovr_name = sprintf("libcurses%s.a", suffix)
+-                                               } else {
+-                                                       ovr_name = sprintf("libcurses%s", suffix)
+-                                               }
++                                               ovr_name = sprintf("libcurses%s", suffix)
+                                                printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name
+                                        }
+                                }
 @@ -396,12 +403,13 @@
                                 end_name = lib_name;
@@ -33016 +41411 @@
                                 print  "install.libs \\"
 diff -Naur ncurses-5.9.orig/ncurses/Makefile.in ncurses-5.9/ncurses/Makefile.in
---- ncurses-5.9.orig/ncurses/Makefile.in        2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/ncurses/Makefile.in     2012-02-16 18:25:12.975818378 +0000
+--- ncurses-5.9.orig/ncurses/Makefile.in        2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/Makefile.in     2012-08-25 19:58:02.389886808 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.130 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.131 2011/08/07 15:46:50 tom Exp $
++# $Id: Makefile.in,v 1.133 2012/08/11 21:31:56 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
  #                                                                            #
  # Permission is hereby granted, free of charge, to any person obtaining a    #
  # copy of this software and associated documentation files (the "Software"), #
-@@ -125,6 +125,7 @@
+@@ -64,6 +64,7 @@
+ bindir         = @bindir@
+ libdir         = @libdir@
+ includedir     = @includedir@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ 
+ LIBTOOL                = @LIBTOOL@
+@@ -125,6 +126,7 @@
  TINFO_LIST     = $(SHLIB_DIRS) @TINFO_LIST@
  TICS_LIST      = $(SHLIB_DIRS) @TICS_LIST@
@@ -33035 +41438 @@
  
  NCURSES_MAJOR  = @NCURSES_MAJOR@
+@@ -282,21 +284,21 @@
+        sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@
+ 
+ captoinfo$x : $(tinfo)/captoinfo.c $(TEST_DEPS)
+-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
++       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
+ 
+ hardscroll$x : $(serial)/hardscroll.c $(TEST_DEPS)
+-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
++       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
+ 
+ hashmap$x : $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_DEPS)
+-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
++       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
+ 
+ lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
+                ../@DFT_OBJ_SUBDIR@/dump_entry$o
+-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
++       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
+ 
+ link_test$x : ./link_test.c $(TEST_DEPS) \
+                ../@DFT_OBJ_SUBDIR@/link_test$o
+-       @ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS)
++       @ECHO_LD@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS)
+ 
+ ../@DFT_OBJ_SUBDIR@/dump_entry$o:
+        cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o
+diff -Naur ncurses-5.9.orig/ncurses/base/MKkeyname.awk ncurses-5.9/ncurses/base/MKkeyname.awk
+--- ncurses-5.9.orig/ncurses/base/MKkeyname.awk 2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/MKkeyname.awk      2012-08-25 19:58:00.906560490 +0000
+@@ -1,6 +1,6 @@
+-# $Id: MKkeyname.awk,v 1.45 2010/12/19 01:36:14 tom Exp $
++# $Id: MKkeyname.awk,v 1.47 2012/02/22 22:35:41 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1999-2009,2010 Free Software Foundation, Inc.                #
++# Copyright (c) 1999-2010,2012 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -100,17 +100,18 @@
+        print "                         if (MyTable[c] == 0) {"
+        print "                                 int cc = c;"
+        print "                                 p = name;"
++       print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))"
+        print "                                 if (cc >= 128 && (sp == 0 || sp->_use_meta)) {"
+-       print "                                         strcpy(p, \"M-\");"
++       print "                                         _nc_STRCPY(p, \"M-\", P_LIMIT);"
+        print "                                         p += 2;"
+        print "                                         cc -= 128;"
+        print "                                 }"
+        print "                                 if (cc < 32)"
+-       print "                                         sprintf(p, \"^%c\", cc + '@');"
++       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"^%c\", cc + '@');"
+        print "                                 else if (cc == 127)"
+-       print "                                         strcpy(p, \"^?\");"
++       print "                                         _nc_STRCPY(p, \"^?\", P_LIMIT);"
+        print "                                 else"
+-       print "                                         sprintf(p, \"%c\", cc);"
++       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"%c\", cc);"
+        print "                                 MyTable[c] = strdup(name);"
+        print "                         }"
+        print "                         result = MyTable[c];"
 diff -Naur ncurses-5.9.orig/ncurses/base/MKlib_gen.sh ncurses-5.9/ncurses/base/MKlib_gen.sh
---- ncurses-5.9.orig/ncurses/base/MKlib_gen.sh  2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/MKlib_gen.sh       2012-02-16 18:25:12.975818378 +0000
+--- ncurses-5.9.orig/ncurses/base/MKlib_gen.sh  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/MKlib_gen.sh       2012-08-25 19:58:00.019898016 +0000
 @@ -2,7 +2,7 @@
  #
@@ -33104 +41569 @@
  DECLARATIONS
  
+diff -Naur ncurses-5.9.orig/ncurses/base/MKunctrl.awk ncurses-5.9/ncurses/base/MKunctrl.awk
+--- ncurses-5.9.orig/ncurses/base/MKunctrl.awk  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/MKunctrl.awk       2012-08-25 19:58:01.723223294 +0000
+@@ -1,6 +1,6 @@
+-# $Id: MKunctrl.awk,v 1.26 2009/07/04 22:05:15 Clemens.Ladisch Exp $
++# $Id: MKunctrl.awk,v 1.27 2012/06/09 20:29:33 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -140,7 +140,7 @@
+                } else {
+                        stringname = "unctrl"
+                }
+-               print  "\tint check = ChCharOf(ch);"
++               print  "\tint check = (int) ChCharOf(ch);"
+                print  "\tconst char *result;"
+                print  ""
+                print  "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {"
 diff -Naur ncurses-5.9.orig/ncurses/base/keybound.c ncurses-5.9/ncurses/base/keybound.c
---- ncurses-5.9.orig/ncurses/base/keybound.c    2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/keybound.c 2012-02-16 18:25:12.975818378 +0000
+--- ncurses-5.9.orig/ncurses/base/keybound.c    2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/keybound.c 2012-08-25 19:58:00.019898016 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33136 +41622 @@
  }
 diff -Naur ncurses-5.9.orig/ncurses/base/keyok.c ncurses-5.9/ncurses/base/keyok.c
---- ncurses-5.9.orig/ncurses/base/keyok.c       2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/keyok.c    2012-02-16 18:25:12.975818378 +0000
+--- ncurses-5.9.orig/ncurses/base/keyok.c       2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/keyok.c    2012-08-25 19:58:00.019898016 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33223 +41709 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_addch.c ncurses-5.9/ncurses/base/lib_addch.c
---- ncurses-5.9.orig/ncurses/base/lib_addch.c   2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_addch.c        2012-02-16 18:25:12.975818378 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_addch.c   2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_addch.c        2012-08-25 19:58:00.023231334 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33252 +41738 @@
         SetChar(CHDEREF(ch), result, attrs);
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_addstr.c ncurses-5.9/ncurses/base/lib_addstr.c
---- ncurses-5.9.orig/ncurses/base/lib_addstr.c  2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_addstr.c       2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_addstr.c  2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_addstr.c       2012-08-25 19:58:00.023231334 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33284 +41770 @@
  }
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_bkgd.c ncurses-5.9/ncurses/base/lib_bkgd.c
---- ncurses-5.9.orig/ncurses/base/lib_bkgd.c    2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_bkgd.c 2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_bkgd.c    2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_bkgd.c 2012-08-25 19:58:00.986560110 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -36,7 +36,7 @@
  
@@ -33291 +41784 @@
  
 -MODULE_ID("$Id: lib_bkgd.c,v 1.43 2011/01/22 19:47:37 tom Exp $")
-+MODULE_ID("$Id: lib_bkgd.c,v 1.44 2011/05/28 20:44:22 tom Exp $")
++MODULE_ID("$Id: lib_bkgd.c,v 1.45 2012/03/10 21:20:18 tom Exp $")
  
  /*
   * Set the window's background information.
-@@ -118,11 +118,11 @@
+@@ -118,16 +118,16 @@
  {
      int code = ERR;
@@ -33308 +41801 @@
         wgetbkgrnd(win, &old_bkgrnd);
  
+        (void) wbkgrndset(win, CHREF(new_bkgd));
+-       (void) wattrset(win, AttrOf(win->_nc_bkgd));
++       (void) wattrset(win, (int) AttrOf(win->_nc_bkgd));
+ 
+        for (y = 0; y <= win->_maxy; y++) {
+            for (x = 0; x <= win->_maxx; x++) {
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_color.c ncurses-5.9/ncurses/base/lib_color.c
---- ncurses-5.9.orig/ncurses/base/lib_color.c   2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/lib_color.c        2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_color.c   2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_color.c        2012-08-25 19:58:01.726556612 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33323 +41822 @@
  
 -MODULE_ID("$Id: lib_color.c,v 1.98 2010/04/24 22:57:53 tom Exp $")
-+MODULE_ID("$Id: lib_color.c,v 1.104 2011/10/22 15:53:42 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.105 2012/06/09 20:34:11 tom Exp $")
  
  #ifdef USE_TERM_DRIVER
@@ -33431 +41930 @@
  }
  
+@@ -731,8 +748,8 @@
+     if (!ValidPair(pair)) {
+        result = ERR;
+     } else {
+-       NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]);
+-       NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]);
++       NCURSES_COLOR_T fg = (NCURSES_COLOR_T) FORE_OF(SP_PARM->_color_pairs[pair]);
++       NCURSES_COLOR_T bg = (NCURSES_COLOR_T) BACK_OF(SP_PARM->_color_pairs[pair]);
+ 
+ #if NCURSES_EXT_FUNCS
+        if (fg == COLOR_DEFAULT)
 @@ -765,9 +782,9 @@
  
@@ -33444 +41954 @@
  {
  #ifdef USE_TERM_DRIVER
+@@ -793,7 +810,7 @@
+ 
+     if (old_pair >= 0
+        && SP_PARM != 0
+-       && pair_content(old_pair, &old_fg, &old_bg) != ERR) {
++       && pair_content((short) old_pair, &old_fg, &old_bg) != ERR) {
+        if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
+            || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
+ #if NCURSES_EXT_FUNCS
 @@ -847,7 +864,7 @@
  
@@ -33454 +41973 @@
      NCURSES_SP_NAME(_nc_do_color) (CURRENT_SCREEN,
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.9/ncurses/base/lib_dft_fgbg.c
---- ncurses-5.9.orig/ncurses/base/lib_dft_fgbg.c        2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/lib_dft_fgbg.c     2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_dft_fgbg.c        2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_dft_fgbg.c     2012-08-25 19:58:00.023231334 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33481 +42000 @@
             SP_PARM->_default_color = save;
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_flash.c ncurses-5.9/ncurses/base/lib_flash.c
---- ncurses-5.9.orig/ncurses/base/lib_flash.c   2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_flash.c        2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_flash.c   2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_flash.c        2012-08-25 19:58:00.023231334 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33527 +42046 @@
      returnCode(res);
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_freeall.c ncurses-5.9/ncurses/base/lib_freeall.c
---- ncurses-5.9.orig/ncurses/base/lib_freeall.c 2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_freeall.c      2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_freeall.c 2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_freeall.c      2012-08-25 19:58:00.023231334 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33555 +42074 @@
      FreeIfNeeded(_nc_wacs);
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_getch.c ncurses-5.9/ncurses/base/lib_getch.c
---- ncurses-5.9.orig/ncurses/base/lib_getch.c   2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/lib_getch.c        2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_getch.c   2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_getch.c        2012-08-25 19:58:02.199887706 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33569 +42088 @@
  
 -MODULE_ID("$Id: lib_getch.c,v 1.121 2010/12/25 23:24:04 tom Exp $")
-+MODULE_ID("$Id: lib_getch.c,v 1.124 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
++MODULE_ID("$Id: lib_getch.c,v 1.125 2012/08/04 17:11:37 tom Exp $")
  
  #include <fifo_defs.h>
@@ -33582 +42101 @@
  #if USE_SYSMOUSE
      if ((sp->_mouse_type == M_SYSMOUSE)
-@@ -257,6 +257,13 @@
+@@ -163,7 +163,7 @@
+ static NCURSES_INLINE int
+ fifo_peek(SCREEN *sp)
+ {
+-    int ch = sp->_fifo[peek];
++    int ch = (peek >= 0) ? sp->_fifo[peek] : ERR;
+     TR(TRACE_IEVENT, ("peeking at %d", peek));
+ 
+     p_inc();
+@@ -173,15 +173,16 @@
+ static NCURSES_INLINE int
+ fifo_pull(SCREEN *sp)
+ {
+-    int ch;
+-    ch = sp->_fifo[head];
++    int ch = (head >= 0) ? sp->_fifo[head] : ERR;
++
+     TR(TRACE_IEVENT, ("pulling %s from %d", _nc_tracechar(sp, ch), head));
+ 
+     if (peek == head) {
+        h_inc();
+        peek = head;
+-    } else
++    } else {
+        h_inc();
++    }
+ 
+ #ifdef TRACE
+     if (USE_TRACEF(TRACE_IEVENT)) {
+@@ -200,7 +201,7 @@
+     int mask = 0;
+ 
+     (void) mask;
+-    if (tail == -1)
++    if (tail < 0)
+        return ERR;
+ 
+ #ifdef HIDE_EINTR
+@@ -257,6 +258,13 @@
         n = 1;
      } else
@@ -33596 +42153 @@
  #ifdef USE_TERM_DRIVER
         int buf;
-@@ -270,7 +277,7 @@
+@@ -270,7 +278,7 @@
  #  endif
             _nc_globals.read_thread = pthread_self();
@@ -33605 +42162 @@
         _nc_globals.read_thread = 0;
  #endif
-@@ -569,7 +576,7 @@
+@@ -569,7 +577,7 @@
       *
       * If carriage return is defined as a function key in the
@@ -33614 +42171 @@
       * since the visual result simply moves the cursor to column 0.
       *
+@@ -709,10 +717,11 @@
+ 
+        if (ptr->value != 0) {  /* sequence terminated */
+            TR(TRACE_IEVENT, ("end of sequence"));
+-           if (peek == tail)
++           if (peek == tail) {
+                fifo_clear(sp);
+-           else
++           } else {
+                head = peek;
++           }
+            return (ptr->value);
+        }
+ 
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_getstr.c ncurses-5.9/ncurses/base/lib_getstr.c
---- ncurses-5.9.orig/ncurses/base/lib_getstr.c  2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_getstr.c       2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_getstr.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_getstr.c       2012-08-25 19:58:00.026564651 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33642 +42213 @@
         *--last = '\0';
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_instr.c ncurses-5.9/ncurses/base/lib_instr.c
---- ncurses-5.9.orig/ncurses/base/lib_instr.c   2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/lib_instr.c        2012-02-16 18:25:12.979818483 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_instr.c   2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_instr.c        2012-08-25 19:58:00.026564651 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33670 +42241 @@
                                 done = TRUE;
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_mouse.c ncurses-5.9/ncurses/base/lib_mouse.c
---- ncurses-5.9.orig/ncurses/base/lib_mouse.c   2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_mouse.c        2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_mouse.c   2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_mouse.c        2012-08-25 19:58:02.023221875 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -33684 +42255 @@
  
 -MODULE_ID("$Id: lib_mouse.c,v 1.121 2011/01/22 19:47:47 tom Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.134 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.139 2012/07/21 23:30:50 tom Exp $")
  
  #include <tic.h>
@@ -33716 +42287 @@
  
  #ifndef LIBGPM_SONAME
+@@ -211,7 +225,7 @@
+     char buf[6];
+     unsigned long ignore;
+ 
+-    strncpy(buf, key_mouse, 3);        /* should be "\033[M" */
++    strcpy(buf, "\033[M");     /* should be the same as key_mouse */
+     buf[3] = ' ' + (button - 1) + (down ? 0 : 0x40);
+     buf[4] = ' ' + x - LEFT_COL + 1;
+     buf[5] = ' ' + y - TOP_ROW + 1;
 @@ -219,7 +233,11 @@
  }
@@ -33728 +42308 @@
      SCREEN *sp = (SCREEN *) param;
      unsigned short fWait = MOU_WAIT;
-@@ -673,7 +691,7 @@
+@@ -245,7 +263,8 @@
+                /* sit and wait on the event queue */
+                rc = MouReadEventQue(&mouev, &fWait, hmou);
+                if (rc) {
+-                   sprintf(err, "Error reading mouse queue, rc=%lu.\r\n", rc);
++                   _nc_SPRINTF(err, _nc_SLIMIT(sizeof(err))
++                               "Error reading mouse queue, rc=%lu.\r\n", rc);
+                    break;
+                }
+                if (!sp->_emxmouse_activated)
+@@ -271,9 +290,11 @@
+              finish:
+                oldstate = mouev.fs;
+            }
+-       } else
+-           sprintf(err, "Error setting event mask, buttons=%d, rc=%lu.\r\n",
+-                   nbuttons, rc);
++       } else {
++           _nc_SPRINTF(err, _nc_SLIMIT(sizeof(err))
++                       "Error setting event mask, buttons=%d, rc=%lu.\r\n",
++                       nbuttons, rc);
++       }
+ 
+        DosWrite(2, err, strlen(err), &rc);
+        MouClose(hmou);
+@@ -376,11 +397,19 @@
+ 
+ #if USE_GPM_SUPPORT
+ static bool
+-allow_gpm_mouse(void)
++allow_gpm_mouse(SCREEN *sp)
+ {
+     bool result = FALSE;
+ 
+-    /* GPM does printf's without checking if stdout is a terminal */
++#if USE_WEAK_SYMBOLS
++    /* Danger Robinson: do not use dlopen for libgpm if already loaded */
++    if ((Gpm_Wgetch)) {
++       if (!sp->_mouse_gpm_loaded) {
++           T(("GPM library was already dlopen'd, not by us"));
++       }
++    } else
++#endif
++       /* GPM does printf's without checking if stdout is a terminal */
+     if (isatty(fileno(stdout))) {
+        char *list = getenv("NCURSES_GPM_TERMS");
+        char *env = getenv("TERM");
+@@ -506,7 +535,7 @@
+ 
+     /* Try gpm first, because gpm may be configured to run in xterm */
+ #if USE_GPM_SUPPORT
+-    if (allow_gpm_mouse()) {
++    if (allow_gpm_mouse(sp)) {
+        if (!sp->_mouse_gpm_loaded) {
+ #ifdef HAVE_LIBDL
+            load_gpm_library(sp);
+@@ -673,7 +702,7 @@
  
             sp->_mouse_eventp = FirstEV(sp);
@@ -33737 +42373 @@
             initialize_mousetype(sp);
  
-@@ -750,6 +768,7 @@
+@@ -750,6 +779,7 @@
                         eventp->bstate |= BUTTON3_RELEASED;
                     break;
@@ -33745 +42381 @@
                 }
  
-@@ -830,7 +849,6 @@
+@@ -830,7 +860,6 @@
  
      if (sp->_mouse_type == M_XTERM) {
@@ -33753 +42389 @@
         int res;
  
-@@ -896,35 +914,51 @@
+@@ -896,35 +925,51 @@
  
         /* processing code goes here */
@@ -33816 +42452 @@
  
         case 0x2:
-@@ -939,12 +973,13 @@
+@@ -939,12 +984,13 @@
              * release, we can infer the button actually released by looking at
              * the previous event.
@@ -33832 +42468 @@
                 /*
                  * XFree86 xterm will return a stream of release-events to
-@@ -985,7 +1020,7 @@
+@@ -985,7 +1031,7 @@
  }
  
@@ -33841 +42477 @@
      if (!on && !sp->_mouse_initialized)
         return;
-@@ -994,7 +1029,7 @@
+@@ -994,7 +1040,7 @@
         return;
  
@@ -33850 +42486 @@
         case M_XTERM:
  #if NCURSES_EXT_FUNCS
-@@ -1074,10 +1109,13 @@
+@@ -1074,10 +1120,13 @@
  /* parse a run of atomic mouse events into a gesture */
  {
@@ -33865 +42501 @@
      TR(MY_TRACE, ("_nc_mouse_parse(%d) called", runcount));
  
-@@ -1094,7 +1132,8 @@
+@@ -1094,7 +1143,8 @@
       *
       * It's possible that the run may not resolve to a single event (for
@@ -33875 +42511 @@
       * Note that this routine is independent of the format of the specific
       * format of the pointing-device's reports.  We can use it to parse
-@@ -1102,79 +1141,110 @@
+@@ -1102,79 +1152,110 @@
       * button basis, as long as the device-dependent mouse code puts stuff
       * on the queue in MEVENT format.
@@ -33956 +42592 @@
 +                       changed = FALSE;
 +                       break;
-                    }
-                }
--               if (merge)
--                   next->id = INVALID_EVENT;
++                   }
++               }
 +
 +               if (changed) {
@@ -33973 +42607 @@
 +                   if (merge) {
 +                       Invalidate(ep);
-+                   }
-+               }
-+           }
-+       }
-+
+                    }
+                }
+-               if (merge)
+-                   next->id = INVALID_EVENT;
+            }
+        }
+-    } while
+-       (merge);
+ 
 +       /* Compact valid events */
 +       if (!ValidEvent(ep)) {
@@ -33990 +42628 @@
 +               Invalidate(ep);
 +               first_invalid = NEXT(first_invalid);
-            }
-        }
--    } while
--       (merge);
- 
++           }
++       }
++
 +       ep = next;
 +    }
@@ -34028 +42664 @@
       * NOTE: There is a problem with this design!  If the application
       * allows enough click events to pile up in the circular queue so
-@@ -1187,87 +1257,102 @@
+@@ -1187,87 +1268,102 @@
       * but the timer element would have to have sub-second resolution,
       * which would get us into portability trouble.
@@ -34198 +42834 @@
  
  static void
-@@ -1359,7 +1444,16 @@
+@@ -1359,7 +1455,16 @@
         /* compute the current-event pointer */
         MEVENT *prev = PREV(eventp);
@@ -34216 +42852 @@
             *aevent = *prev;
  
-@@ -1367,9 +1461,16 @@
+@@ -1367,9 +1472,16 @@
                               _nc_tracemouse(SP_PARM, prev),
                               (long) IndexEV(SP_PARM, prev)));
@@ -34235 +42871 @@
      }
      returnCode(result);
-@@ -1420,6 +1521,7 @@
+@@ -1420,6 +1532,7 @@
  /* set the mouse event mask */
  {
@@ -34243 +42879 @@
      T((T_CALLED("mousemask(%p,%#lx,%p)"),
         (void *) SP_PARM,
-@@ -1447,6 +1549,22 @@
+@@ -1447,6 +1560,22 @@
                 mouse_activate(SP_PARM, (bool) (result != 0));
  
@@ -34267 +42903 @@
      }
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_newterm.c ncurses-5.9/ncurses/base/lib_newterm.c
---- ncurses-5.9.orig/ncurses/base/lib_newterm.c 2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/lib_newterm.c      2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_newterm.c 2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_newterm.c      2012-08-25 19:58:00.393229583 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34306 +42942 @@
  #endif
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_newwin.c ncurses-5.9/ncurses/base/lib_newwin.c
---- ncurses-5.9.orig/ncurses/base/lib_newwin.c  2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_newwin.c       2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_newwin.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_newwin.c       2012-08-25 19:58:00.026564651 +0000
 @@ -43,7 +43,7 @@
  #include <curses.priv.h>
@@ -34348 +42984 @@
  
  static bool
+diff -Naur ncurses-5.9.orig/ncurses/base/lib_printw.c ncurses-5.9/ncurses/base/lib_printw.c
+--- ncurses-5.9.orig/ncurses/base/lib_printw.c  2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_printw.c       2012-08-25 19:58:00.986560110 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -39,7 +39,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_printw.c,v 1.20 2009/10/24 22:07:03 tom Exp $")
++MODULE_ID("$Id: lib_printw.c,v 1.22 2012/03/10 20:47:33 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ printw(const char *fmt,...)
+@@ -48,10 +48,12 @@
+     int code;
+ 
+ #ifdef TRACE
+-    va_start(argp, fmt);
++    va_list argq;
++    begin_va_copy(argq, argp);
++    va_start(argq, fmt);
+     T((T_CALLED("printw(%s%s)"),
+-       _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
+-    va_end(argp);
++       _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
++    end_va_copy(argq);
+ #endif
+ 
+     va_start(argp, fmt);
+@@ -68,10 +70,12 @@
+     int code;
+ 
+ #ifdef TRACE
+-    va_start(argp, fmt);
++    va_list argq;
++    begin_va_copy(argq, argp);
++    va_start(argq, fmt);
+     T((T_CALLED("wprintw(%p,%s%s)"),
+-       (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
+-    va_end(argp);
++       (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
++    end_va_copy(argq);
+ #endif
+ 
+     va_start(argp, fmt);
+@@ -88,10 +92,12 @@
+     int code;
+ 
+ #ifdef TRACE
+-    va_start(argp, fmt);
++    va_list argq;
++    begin_va_copy(argq, argp);
++    va_start(argq, fmt);
+     T((T_CALLED("mvprintw(%d,%d,%s%s)"),
+-       y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
+-    va_end(argp);
++       y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
++    end_va_copy(argq);
+ #endif
+ 
+     if ((code = move(y, x)) != ERR) {
+@@ -109,10 +115,12 @@
+     int code;
+ 
+ #ifdef TRACE
+-    va_start(argp, fmt);
++    va_list argq;
++    begin_va_copy(argq, argp);
++    va_start(argq, fmt);
+     T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"),
+-       y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp)));
+-    va_end(argp);
++       y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
++    end_va_copy(argq);
+ #endif
+ 
+     if ((code = wmove(win, y, x)) != ERR) {
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_refresh.c ncurses-5.9/ncurses/base/lib_refresh.c
---- ncurses-5.9.orig/ncurses/base/lib_refresh.c 2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_refresh.c      2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_refresh.c 2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_refresh.c      2012-08-25 19:58:00.026564651 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34395 +43114 @@
      begy = win->_begy;
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_restart.c ncurses-5.9/ncurses/base/lib_restart.c
---- ncurses-5.9.orig/ncurses/base/lib_restart.c 2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/lib_restart.c      2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_restart.c 2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_restart.c      2012-08-25 19:58:00.026564651 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34418 +43137 @@
  NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_scanw.c ncurses-5.9/ncurses/base/lib_scanw.c
---- ncurses-5.9.orig/ncurses/base/lib_scanw.c   2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_scanw.c        2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_scanw.c   2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_scanw.c        2012-08-25 19:58:00.029897968 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34445 +43164 @@
      return (vsscanf(buf, fmt, argp));
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_screen.c ncurses-5.9/ncurses/base/lib_screen.c
---- ncurses-5.9.orig/ncurses/base/lib_screen.c  2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_screen.c       2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_screen.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_screen.c       2012-08-25 19:58:00.029897968 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34518 +43237 @@
  NCURSES_EXPORT(int)
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_scroll.c ncurses-5.9/ncurses/base/lib_scroll.c
---- ncurses-5.9.orig/ncurses/base/lib_scroll.c  2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_scroll.c       2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_scroll.c  2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_scroll.c       2012-08-25 19:58:00.029897968 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34545 +43264 @@
      int limit;
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_set_term.c ncurses-5.9/ncurses/base/lib_set_term.c
---- ncurses-5.9.orig/ncurses/base/lib_set_term.c        2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_set_term.c     2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_set_term.c        2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_set_term.c     2012-08-25 19:58:01.893222491 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34559 +43278 @@
  
 -MODULE_ID("$Id: lib_set_term.c,v 1.138 2010/12/20 00:42:20 tom Exp $")
-+MODULE_ID("$Id: lib_set_term.c,v 1.140 2011/10/22 16:10:43 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.141 2012/07/07 20:37:40 tom Exp $")
  
  #ifdef USE_TERM_DRIVER
@@ -34572 +43291 @@
  {
      char *env;
-@@ -695,7 +695,7 @@
+@@ -619,6 +619,7 @@
+ #endif
+ #if USE_SIZECHANGE
+     sp->_resize = NCURSES_SP_NAME(resizeterm);
++    sp->_ungetch = safe_ungetch;
+ #endif
+ 
+     NewScreen(sp)->_clear = TRUE;
+@@ -695,7 +696,7 @@
  _nc_setupscreen(int slines GCC_UNUSED,
                 int scolumns GCC_UNUSED,
@@ -34581 +43308 @@
  {
      SCREEN *sp = 0;
-@@ -759,6 +759,7 @@
+@@ -759,6 +760,7 @@
                              int line,
                              int (*init) (WINDOW *, int))
@@ -34589 +43316 @@
                                             (line < 0) ? -1 : 1,
                                             init);
+diff -Naur ncurses-5.9.orig/ncurses/base/lib_slkrefr.c ncurses-5.9/ncurses/base/lib_slkrefr.c
+--- ncurses-5.9.orig/ncurses/base/lib_slkrefr.c 2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_slkrefr.c      2012-08-25 19:58:01.726556612 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -43,7 +43,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_slkrefr.c,v 1.26 2010/05/01 19:17:28 tom Exp $")
++MODULE_ID("$Id: lib_slkrefr.c,v 1.27 2012/06/09 20:29:33 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels    InfoOf(SP_PARM).numlabels
+@@ -109,13 +109,13 @@
+                        slk_paint_info(slk->win);
+                    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
+                    if (sp->_slk) {
+-                       (void) wattrset(slk->win, AttrOf(sp->_slk->attr));
++                       (void) wattrset(slk->win, (int) AttrOf(sp->_slk->attr));
+                    }
+                    waddstr(slk->win, slk->ent[i].form_text);
+                    /* if we simulate SLK's, it's looking much more
+                       natural to use the current ATTRIBUTE also
+                       for the label window */
+-                   (void) wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
++                   (void) wattrset(slk->win, (int) WINDOW_ATTRS(StdScreen(sp)));
+                }
+            }
+            slk->ent[i].dirty = FALSE;
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_slkset.c ncurses-5.9/ncurses/base/lib_slkset.c
---- ncurses-5.9.orig/ncurses/base/lib_slkset.c  2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_slkset.c       2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_slkset.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/lib_slkset.c       2012-08-25 19:58:00.029897968 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34639 +43401 @@
  
      slk->ent[i].form_text[numchrs - numcols + limit] = 0;
+diff -Naur ncurses-5.9.orig/ncurses/base/lib_touch.c ncurses-5.9/ncurses/base/lib_touch.c
+--- ncurses-5.9.orig/ncurses/base/lib_touch.c   2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_touch.c        2012-08-25 19:58:01.726556612 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -43,7 +43,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_touch.c,v 1.11 2010/12/19 01:22:58 tom Exp $")
++MODULE_ID("$Id: lib_touch.c,v 1.12 2012/06/09 20:29:33 tom Exp $")
+ 
+ NCURSES_EXPORT(bool)
+ is_linetouched(WINDOW *win, int line)
+@@ -84,7 +84,7 @@
+     for (i = y; i < y + n; i++) {
+        if (i > win->_maxy)
+            break;
+-       win->_line[i].firstchar = changed ? 0 : _NOCHANGE;
++       win->_line[i].firstchar = (NCURSES_SIZE_T) (changed ? 0 : _NOCHANGE);
+        win->_line[i].lastchar = (NCURSES_SIZE_T) (changed
+                                                   ? win->_maxx
+                                                   : _NOCHANGE);
 diff -Naur ncurses-5.9.orig/ncurses/base/lib_ungetch.c ncurses-5.9/ncurses/base/lib_ungetch.c
---- ncurses-5.9.orig/ncurses/base/lib_ungetch.c 2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/lib_ungetch.c      2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/lib_ungetch.c 2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/lib_ungetch.c      2012-08-25 19:58:02.199887706 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34654 +43444 @@
  
 -MODULE_ID("$Id: lib_ungetch.c,v 1.14 2009/10/24 22:12:21 tom Exp $")
-+MODULE_ID("$Id: lib_ungetch.c,v 1.15 2011/05/28 22:52:06 tom Exp $")
++MODULE_ID("$Id: lib_ungetch.c,v 1.16 2012/08/04 17:38:53 tom Exp $")
  
  #include <fifo_defs.h>
  
-@@ -64,7 +64,7 @@
+@@ -64,13 +64,14 @@
  
      T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
  
 -    if (tail != -1) {
-+    if (sp != 0 && tail != -1) {
-        if (head == -1) {
+-       if (head == -1) {
++    if (sp != 0 && tail >= 0) {
++       if (head < 0) {
             head = 0;
             t_inc();
+            peek = tail;        /* no raw keys */
+-       } else
++       } else {
+            h_dec();
++       }
+ 
+        sp->_fifo[head] = ch;
+        T(("ungetch %s ok", _nc_tracechar(sp, ch)));
 diff -Naur ncurses-5.9.orig/ncurses/base/resizeterm.c ncurses-5.9/ncurses/base/resizeterm.c
---- ncurses-5.9.orig/ncurses/base/resizeterm.c  2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/base/resizeterm.c       2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/resizeterm.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/resizeterm.c       2012-08-25 19:58:01.893222491 +0000
 @@ -45,7 +45,7 @@
  #define CUR SP_TERMTYPE
@@ -34675 +43474 @@
  
 -MODULE_ID("$Id: resizeterm.c,v 1.43 2011/01/10 01:34:49 tom Exp $")
-+MODULE_ID("$Id: resizeterm.c,v 1.44 2011/09/03 18:29:11 tom Exp $")
++MODULE_ID("$Id: resizeterm.c,v 1.45 2012/07/07 17:07:23 tom Exp $")
  
  /*
@@ -34783 +43582 @@
      _nc_nonsp_unlock_global(curses);
  
+@@ -471,7 +484,6 @@
+            result = NCURSES_SP_NAME(resize_term) (NCURSES_SP_ARGx ToLines, ToCols);
+ 
+ #if USE_SIGWINCH
+-           safe_ungetch(SP_PARM, KEY_RESIZE);  /* so application can know this */
+            clearok(CurScreen(SP_PARM), TRUE);  /* screen contents are unknown */
+ 
+            /* ripped-off lines are a special case: if we did not lengthen
+@@ -501,6 +513,9 @@
+            }
+ #endif
+        }
++#if USE_SIGWINCH
++       safe_ungetch(SP_PARM, KEY_RESIZE);      /* so application can know this */
++#endif
+     }
+ 
+     returnCode(result);
+diff -Naur ncurses-5.9.orig/ncurses/base/safe_sprintf.c ncurses-5.9/ncurses/base/safe_sprintf.c
+--- ncurses-5.9.orig/ncurses/base/safe_sprintf.c        2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/safe_sprintf.c     2012-08-25 19:58:00.909893807 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -33,7 +33,7 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: safe_sprintf.c,v 1.24 2010/06/05 22:22:27 tom Exp $")
++MODULE_ID("$Id: safe_sprintf.c,v 1.26 2012/02/22 22:40:24 tom Exp $")
+ 
+ #if USE_SAFE_SPRINTF
+ 
+@@ -109,12 +109,15 @@
+                    } else if (state == Prec) {
+                        prec = ival;
+                    }
+-                   sprintf(fmt_arg, "%d", ival);
++                   _nc_SPRINTF(fmt_arg,
++                               _nc_SLIMIT(sizeof(fmt_arg))
++                               "%d", ival);
+                    fmt_len += strlen(fmt_arg);
+                    if ((format = _nc_doalloc(format, fmt_len)) == 0) {
+                        return -1;
+                    }
+-                   strcpy(&format[--f], fmt_arg);
++                   --f;
++                   _nc_STRCPY(&format[f], fmt_arg, fmt_len - f);
+                    f = strlen(format);
+                } else if (isalpha(UChar(*fmt))) {
+                    done = TRUE;
+@@ -185,13 +188,13 @@
+            format[f] = '\0';
+            switch (used) {
+            case 'i':
+-               sprintf(buffer, format, ival);
++               _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, ival);
+                break;
+            case 'f':
+-               sprintf(buffer, format, fval);
++               _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, fval);
+                break;
+            default:
+-               sprintf(buffer, format, pval);
++               _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, pval);
+                break;
+            }
+            len += (int) strlen(buffer);
+diff -Naur ncurses-5.9.orig/ncurses/base/vsscanf.c ncurses-5.9/ncurses/base/vsscanf.c
+--- ncurses-5.9.orig/ncurses/base/vsscanf.c     2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/base/vsscanf.c  2012-08-25 19:58:00.909893807 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2004,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -38,7 +38,7 @@
+ 
+ #if !HAVE_VSSCANF
+ 
+-MODULE_ID("$Id: vsscanf.c,v 1.18 2004/04/03 20:27:02 tom Exp $")
++MODULE_ID("$Id: vsscanf.c,v 1.20 2012/02/22 22:26:58 tom Exp $")
+ 
+ #if !(HAVE_VFSCANF || HAVE__DOSCAN)
+ 
+@@ -293,12 +293,12 @@
+ 
+                /* add %n, if the format was not that */
+                if (chunk != cAssigned) {
+-                   strcat(my_fmt, "%n");
++                   _nc_STRCAT(my_fmt, "%n", len_fmt);
+                }
+ 
+                switch (chunk) {
+                case cAssigned:
+-                   strcat(my_fmt, "%n");
++                   _nc_STRCAT(my_fmt, "%n", len_fmt);
+                    pointer = &eaten;
+                    break;
+                case cInt:
 diff -Naur ncurses-5.9.orig/ncurses/base/wresize.c ncurses-5.9/ncurses/base/wresize.c
---- ncurses-5.9.orig/ncurses/base/wresize.c     2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/base/wresize.c  2012-02-16 18:25:12.983818589 +0000
+--- ncurses-5.9.orig/ncurses/base/wresize.c     2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/base/wresize.c  2012-08-25 19:58:00.029897968 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34815 +43720 @@
  
         if_USE_SCROLL_HINTS(new_lines[row].oldindex = row);
+diff -Naur ncurses-5.9.orig/ncurses/build.priv.h ncurses-5.9/ncurses/build.priv.h
+--- ncurses-5.9.orig/ncurses/build.priv.h       2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/build.priv.h    2012-08-25 19:58:00.909893807 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2010 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2010,2012 Free Software Foundation, Inc.                   *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -30,9 +30,8 @@
+  *  Author: Thomas E. Dickey                        2010                    *
+  ****************************************************************************/
+ 
+-
+ /*
+- * $Id: build.priv.h,v 1.6 2010/05/22 20:30:35 tom Exp $
++ * $Id: build.priv.h,v 1.9 2012/02/22 22:17:02 tom Exp $
+  *
+  *     build.priv.h
+  *
+@@ -83,6 +82,7 @@
+ #define SIZEOF(v)        (sizeof(v) / sizeof(v[0]))
+ 
+ #include <nc_alloc.h>
++#include <nc_string.h>
+ 
+ /* declare these, to avoid needing term.h */
+ #if BROKEN_LINKER || USE_REENTRANT
 diff -Naur ncurses-5.9.orig/ncurses/curses.priv.h ncurses-5.9/ncurses/curses.priv.h
---- ncurses-5.9.orig/ncurses/curses.priv.h      2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/curses.priv.h   2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/curses.priv.h      2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/curses.priv.h   2012-08-25 19:58:01.936555619 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34830 +43764 @@
  /*
 - * $Id: curses.priv.h,v 1.475 2011/01/22 21:10:19 tom Exp $
-+ * $Id: curses.priv.h,v 1.492 2012/01/21 19:21:29 KO.Myung-Hun Exp $
++ * $Id: curses.priv.h,v 1.502 2012/07/14 21:14:30 tom Exp $
   *
   *     curses.priv.h
@@ -34842 +43776 @@
  #if HAVE_UNISTD_H
  #include <unistd.h>
-@@ -135,6 +136,15 @@
+@@ -111,6 +112,14 @@
+ #define USE_FUNC_POLL 0
+ #endif
+ 
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++
+ /* include signal.h before curses.h to work-around defect in glibc 2.1.3 */
+ #include <signal.h>
+ 
+@@ -135,6 +144,15 @@
  #define USE_EMX_MOUSE 0
  #endif
@@ -34858 +43807 @@
  #define EV_MAX         8       /* size of mouse circular event queue */
  
-@@ -192,6 +202,18 @@
+@@ -192,6 +210,18 @@
  #endif
  
@@ -34877 +43826 @@
   */
  #if !USE_SCROLL_HINTS
-@@ -325,6 +347,7 @@
+@@ -208,6 +238,8 @@
+ #define if_USE_SCROLL_HINTS(stmt) /*nothing*/
+ #endif
+ 
++#include <nc_string.h>
++
+ /*
+  * Options for terminal drivers, etc...
+  */
+@@ -325,6 +357,7 @@
  #endif
  
@@ -34885 +43843 @@
  /*
   * Reduce dependency on cur_term global by using terminfo data from SCREEN's
-@@ -766,6 +789,11 @@
+@@ -365,7 +398,7 @@
+ #define if_EXT_COLORS(stmt)    stmt
+ #define SetPair(value,p)       SetPair2((value).ext_color, AttrOf(value), p)
+ #define SetPair2(c,a,p)                c = (p), \
+-                               a = (unColor2(a) | (A_COLOR & ColorPair(oldColor(c))))
++                               a = (unColor2(a) | (A_COLOR & (unsigned) ColorPair(oldColor(c))))
+ #define GetPair(value)         GetPair2((value).ext_color, AttrOf(value))
+ #define GetPair2(c,a)          ((c) ? (c) : PairNumber(a))
+ #define oldColor(p)            (((p) > 255) ? 255 : (p))
+@@ -374,9 +407,9 @@
+ #define SameAttrOf(a,b)                (AttrOf(a) == AttrOf(b) && GetPair(a) == GetPair(b))
+ 
+ #if NCURSES_SP_FUNCS
+-#define VIDATTR(sp,attr,pair)  NCURSES_SP_NAME(vid_attr)(sp, attr, pair, 0)
++#define VIDATTR(sp,attr,pair)  NCURSES_SP_NAME(vid_attr)(sp, attr, (short) pair, 0)
+ #else
+-#define VIDATTR(sp,attr,pair)  vid_attr(attr, pair, 0)
++#define VIDATTR(sp,attr,pair)  vid_attr(attr, (short) pair, 0)
+ #endif
+ 
+ #else /* !NCURSES_EXT_COLORS */
+@@ -467,6 +500,9 @@
+ #  endif
+ #  define _declare(name)       __extension__ extern __typeof__(name) name
+ #  define weak_symbol(name)    _weak_pragma(name) _declare(name) __attribute__((weak))
++#else
++#  undef USE_WEAK_SYMBOLS
++#  define USE_WEAK_SYMBOLS 0
+ #endif
+ #endif
+ 
+@@ -665,6 +701,9 @@
+ #if USE_GPM_SUPPORT
+ #undef buttons                 /* term.h defines this, and gpm uses it! */
+ #include <gpm.h>
++#if USE_WEAK_SYMBOLS
++weak_symbol(Gpm_Wgetch);
++#endif
+ 
+ #ifdef HAVE_LIBDL
+ /* link dynamically to GPM */
+@@ -766,6 +805,11 @@
  #define INIT_TERM_DRIVER()     /* nothing */
  #endif
@@ -34897 +43896 @@
   * Global data which is not specific to a screen.
   */
-@@ -776,7 +804,7 @@
+@@ -776,7 +820,7 @@
         bool            init_signals;
         bool            init_screen;
@@ -34906 +43905 @@
  
         bool            have_tic_directory;
-@@ -798,6 +826,12 @@
+@@ -798,6 +842,12 @@
         int             tgetent_index;
         long            tgetent_sequence;
@@ -34919 +43918 @@
         WINDOWLIST      *_nc_windowlist;
  #define WindowList(sp) _nc_globals._nc_windowlist
-@@ -1015,6 +1049,7 @@
+@@ -891,6 +941,7 @@
+        const char      *_tputs_trace;
+ #endif
+ #endif
++       bool            use_tioctl;
+ } NCURSES_PRESCREEN;
+ 
+ /*
+@@ -1015,6 +1066,7 @@
         int             _pair_count;    /* count of color pairs              */
         int             _pair_limit;    /* actual limit of color-pairs       */
@@ -34927 +43934 @@
         bool            _has_sgr_39_49; /* has ECMA default color support    */
         int             _default_fg;    /* assumed default foreground        */
-@@ -1032,6 +1067,10 @@
+@@ -1032,6 +1084,10 @@
         bool            _use_rmso;      /* true if we may use 'rmso'         */
         bool            _use_rmul;      /* true if we may use 'rmul'         */
@@ -34938 +43945 @@
          * These data correspond to the state of the idcok() and idlok()
          * functions.  A caveat is in order here:  the XSI and SVr4
-@@ -1055,7 +1094,9 @@
+@@ -1055,7 +1111,9 @@
         void            (*_mouse_wrap)  (SCREEN *);
         int             _mouse_fd;      /* file-descriptor, if any */
@@ -34949 +43956 @@
         MEVENT          _mouse_events[EV_MAX];  /* hold the last mouse event seen */
         MEVENT          *_mouse_eventp; /* next free slot in event queue */
-@@ -1168,7 +1209,7 @@
+@@ -1102,6 +1160,7 @@
+         */
+ #if USE_SIZECHANGE
+        int             (*_resize)(NCURSES_SP_DCLx int y, int x);
++       int             (*_ungetch)(SCREEN *, int);
+ #endif
+ 
+        /*
+@@ -1159,6 +1218,8 @@
+         */
+        bool            _screen_acs_fix;
+ #endif
++
++       bool            _use_tioctl;
+ };
+ 
+ extern NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain;
+@@ -1168,7 +1229,7 @@
         WINDOWLIST *next;
         SCREEN *screen;         /* screen containing the window */
@@ -34958 +43982 @@
         unsigned addch_used;    /* number of bytes in addch_work[] */
         int addch_x;            /* x-position for addch_work[] */
-@@ -1339,7 +1380,7 @@
+@@ -1339,7 +1400,7 @@
                                         putc(PUTC_ch,b);                            \
                                     break;                                          \
@@ -34967 +43991 @@
                             COUNT_OUTCHARS(PUTC_i);                                 \
                         } } } while (0)
-@@ -1412,25 +1453,25 @@
+@@ -1412,25 +1473,25 @@
  
  #define CHANGED_CELL(line,col) \
@@ -35000 +44024 @@
  #define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
  
-@@ -1528,7 +1569,7 @@
+@@ -1528,7 +1589,7 @@
  #define returnVoidPtr(code)    TRACE_RETURN(code,void_ptr)
  #define returnWin(code)                TRACE_RETURN(code,win)
@@ -35009 +44033 @@
  extern NCURSES_EXPORT(SCREEN *)         _nc_retrace_sp (SCREEN *);
  extern NCURSES_EXPORT(WINDOW *)         _nc_retrace_win (WINDOW *);
-@@ -1539,7 +1580,7 @@
+@@ -1539,7 +1600,7 @@
  extern NCURSES_EXPORT(chtype)           _nc_retrace_chtype (chtype);
  extern NCURSES_EXPORT(const char *)     _nc_altcharset_name(attr_t, chtype);
@@ -35018 +44042 @@
  extern NCURSES_EXPORT(int)              _nc_retrace_int_attr_t (attr_t);
  extern NCURSES_EXPORT(mmask_t)          _nc_retrace_mmask_t (SCREEN *, mmask_t);
-@@ -1816,12 +1857,31 @@
+@@ -1816,12 +1877,31 @@
  extern NCURSES_EXPORT(char *) _nc_get_locale(void);
  extern NCURSES_EXPORT(int)    _nc_unicode_locale(void);
@@ -35052 +44076 @@
  #if USE_SIGWINCH
  extern NCURSES_EXPORT(int) _nc_handle_sigwinch(SCREEN *);
-@@ -1875,16 +1935,16 @@
+@@ -1875,16 +1955,16 @@
  extern NCURSES_EXPORT(int) _nc_baudrate (int);
  extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
@@ -35064 +44088 @@
  extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const);
 -extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int);
+ extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE *);
 +extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
- extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE *);
  extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
 -extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, NCURSES_OUTC);
@@ -35072 +44096 @@
  extern NCURSES_EXPORT(void) _nc_free_and_exit (int) GCC_NORETURN;
  extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE *);
-@@ -1895,8 +1955,8 @@
+@@ -1895,8 +1975,9 @@
  extern NCURSES_EXPORT(void) _nc_make_oldhash (int i);
  extern NCURSES_EXPORT(void) _nc_scroll_oldhash (int n, int top, int bot);
@@ -35079 +44103 @@
 -extern NCURSES_EXPORT(void) _nc_signal_handler (bool);
 +extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, int);
++extern NCURSES_EXPORT(void) _nc_setenv_num (const char *, int);
 +extern NCURSES_EXPORT(void) _nc_signal_handler (int);
  extern NCURSES_EXPORT(void) _nc_synchook (WINDOW *);
  extern NCURSES_EXPORT(void) _nc_trace_tries (TRIES *);
  
-@@ -1906,6 +1966,7 @@
+@@ -1905,7 +1986,9 @@
+ extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void);
  extern NCURSES_EXPORT(void) _nc_codes_leaks(void);
  extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void);
++extern NCURSES_EXPORT(void) _nc_comp_error_leaks(void);
  extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void);
 +extern NCURSES_EXPORT(void) _nc_db_iterator_leaks(void);
@@ -35091 +44118 @@
  extern NCURSES_EXPORT(void) _nc_names_leaks(void);
  extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
-@@ -1914,7 +1975,7 @@
+@@ -1914,7 +1997,7 @@
  #if !(defined(USE_TERMLIB) || defined(USE_BUILD_CC))
  extern NCURSES_EXPORT(NCURSES_CH_T) _nc_render (WINDOW *, NCURSES_CH_T);
@@ -35100 +44127 @@
  
  #if USE_WIDEC_SUPPORT
-@@ -1947,7 +2008,7 @@
+@@ -1947,7 +2030,7 @@
   */
  #if USE_WIDEC_SUPPORT
@@ -35109 +44136 @@
  #define check_mbytes(wch,buffer,length,state) \
         (int) mbtowc(&wch, buffer, length)
-@@ -2084,39 +2145,39 @@
+@@ -2084,39 +2167,39 @@
  
  typedef struct term_driver {
@@ -35170 +44197 @@
  } TERM_DRIVER;
  
-@@ -2174,7 +2235,7 @@
+@@ -2174,7 +2257,7 @@
   */
  #ifdef USE_TERM_DRIVER
@@ -35179 +44206 @@
         _nc_get_screensize(sp, tp, lp, cp)
  #define TINFO_SET_CURTERM(sp, tp) \
-@@ -2250,12 +2311,12 @@
+@@ -2250,12 +2333,12 @@
  extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*);
  extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int);
@@ -35194 +44221 @@
  extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_flush)(SCREEN*);
  extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_free_and_exit)(SCREEN*, int) GCC_NORETURN;
-@@ -2271,7 +2332,7 @@
+@@ -2271,7 +2354,7 @@
  extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_screen_wrap)(SCREEN*);
  extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_scroll_oldhash)(SCREEN*, int n, int top, int bot);
@@ -35203 +44230 @@
  extern NCURSES_EXPORT(void)     _nc_cookie_init(SCREEN *sp);
  
+diff -Naur ncurses-5.9.orig/ncurses/fifo_defs.h ncurses-5.9/ncurses/fifo_defs.h
+--- ncurses-5.9.orig/ncurses/fifo_defs.h        2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/fifo_defs.h     2012-08-25 19:58:02.199887706 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2002,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,7 +34,7 @@
+ /*
+  * Common macros for lib_getch.c, lib_ungetch.c
+  *
+- * $Id: fifo_defs.h,v 1.6 2008/06/28 15:52:32 tom Exp $
++ * $Id: fifo_defs.h,v 1.7 2012/08/04 15:59:17 tom Exp $
+  */
+ 
+ #ifndef FIFO_DEFS_H
+@@ -45,14 +45,42 @@
+ /* peek points to next uninterpreted character */
+ #define peek   sp->_fifopeek
+ 
+-#define h_inc() { head == FIFO_SIZE-1 ? head = 0 : head++; if (head == tail) head = -1, tail = 0;}
+-#define h_dec() { head == 0 ? head = FIFO_SIZE-1 : head--; if (head == tail) tail = -1;}
+-#define t_inc() { tail == FIFO_SIZE-1 ? tail = 0 : tail++; if (tail == head) tail = -1;}
+-#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear(sp);}
+-#define p_inc() { peek == FIFO_SIZE-1 ? peek = 0 : peek++;}
++#define h_inc() { \
++           (head >= FIFO_SIZE-1) \
++               ? head = 0 \
++               : head++; \
++           if (head == tail) \
++               head = -1, tail = 0; \
++       }
++#define h_dec() { \
++           (head <= 0) \
++               ? head = FIFO_SIZE-1 \
++               : head--; \
++           if (head == tail) \
++               tail = -1; \
++       }
++#define t_inc() { \
++           (tail >= FIFO_SIZE-1) \
++               ? tail = 0 \
++               : tail++; \
++           if (tail == head) \
++               tail = -1; \
++           }
++#define t_dec() { \
++           (tail <= 0) \
++               ? tail = FIFO_SIZE-1 \
++               : tail--; \
++           if (head == tail) \
++               fifo_clear(sp); \
++           }
++#define p_inc() { \
++           (peek >= FIFO_SIZE-1) \
++               ? peek = 0 \
++               : peek++; \
++           }
+ 
+-#define cooked_key_in_fifo()   ((head != -1) && (peek != head))
+-#define raw_key_in_fifo()      ((head != -1) && (peek != tail))
++#define cooked_key_in_fifo()   ((head >= 0) && (peek != head))
++#define raw_key_in_fifo()      ((head >= 0) && (peek != tail))
+ 
+ #undef HIDE_EINTR
+ 
+diff -Naur ncurses-5.9.orig/ncurses/llib-lncurses ncurses-5.9/ncurses/llib-lncurses
+--- ncurses-5.9.orig/ncurses/llib-lncurses      2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/llib-lncurses   2012-08-25 19:58:01.939888937 +0000
+@@ -3369,6 +3369,17 @@
+                NCURSES_BOOL f)
+                { /* void */ }
+ 
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl
++void   use_tioctl(
++               NCURSES_BOOL f)
++               { /* void */ }
++
+ #undef _nc_get_screensize
+ void   _nc_get_screensize(
+                SCREEN  *sp, 
+diff -Naur ncurses-5.9.orig/ncurses/llib-lncursest ncurses-5.9/ncurses/llib-lncursest
+--- ncurses-5.9.orig/ncurses/llib-lncursest     2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/llib-lncursest  2012-08-25 19:58:01.939888937 +0000
+@@ -3449,6 +3449,17 @@
+                NCURSES_BOOL f)
+                { /* void */ }
+ 
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl
++void   use_tioctl(
++               NCURSES_BOOL f)
++               { /* void */ }
++
+ #undef _nc_get_screensize
+ void   _nc_get_screensize(
+                SCREEN  *sp, 
+diff -Naur ncurses-5.9.orig/ncurses/llib-lncursestw ncurses-5.9/ncurses/llib-lncursestw
+--- ncurses-5.9.orig/ncurses/llib-lncursestw    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/llib-lncursestw 2012-08-25 19:58:01.996555329 +0000
+@@ -4234,6 +4234,17 @@
+                NCURSES_BOOL f)
+                { /* void */ }
+ 
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioct
++void   use_tioct(
++               NCURSES_BOOL f)
++               { /* void */ }
++
+ #undef _nc_get_screensize
+ void   _nc_get_screensize(
+                SCREEN  *sp, 
+diff -Naur ncurses-5.9.orig/ncurses/llib-lncursesw ncurses-5.9/ncurses/llib-lncursesw
+--- ncurses-5.9.orig/ncurses/llib-lncursesw     2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/llib-lncursesw  2012-08-25 19:58:01.996555329 +0000
+@@ -4154,6 +4154,17 @@
+                NCURSES_BOOL f)
+                { /* void */ }
+ 
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl
++void   use_tioctl(
++               NCURSES_BOOL f)
++               { /* void */ }
++
+ #undef _nc_get_screensize
+ void   _nc_get_screensize(
+                SCREEN  *sp, 
+diff -Naur ncurses-5.9.orig/ncurses/llib-ltic ncurses-5.9/ncurses/llib-ltic
+--- ncurses-5.9.orig/ncurses/llib-ltic  1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/ncurses/llib-ltic       2012-08-25 19:58:01.856555996 +0000
+@@ -0,0 +1,212 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey 2012                                           *
++ ****************************************************************************/
++/* LINTLIBRARY */
++
++/* ./tinfo/alloc_entry.c */
++
++#include <curses.priv.h>
++#include <tic.h>
++
++#undef _nc_init_entry
++void   _nc_init_entry(
++               TERMTYPE *const tp)
++               { /* void */ }
++
++#undef _nc_copy_entry
++ENTRY  *_nc_copy_entry(
++               ENTRY   *oldp)
++               { return(*(ENTRY **)0); }
++
++#undef _nc_save_str
++char   *_nc_save_str(
++               const char *const string)
++               { return(*(char **)0); }
++
++#undef _nc_wrap_entry
++void   _nc_wrap_entry(
++               ENTRY   *const ep, 
++               NCURSES_BOOL copy_strings)
++               { /* void */ }
++
++#undef _nc_merge_entry
++void   _nc_merge_entry(
++               TERMTYPE *const to, 
++               TERMTYPE *const from)
++               { /* void */ }
++
++/* ./tinfo/captoinfo.c */
++
++#include <ctype.h>
++
++#undef _nc_captoinfo
++char   *_nc_captoinfo(
++               const char *cap, 
++               const char *s, 
++               int const parameterized)
++               { return(*(char **)0); }
++
++#undef _nc_infotocap
++char   *_nc_infotocap(
++               const char *cap, 
++               const char *str, 
++               int const parameterized)
++               { return(*(char **)0); }
++
++/* ./tinfo/comp_expand.c */
++
++#undef _nc_tic_expand
++char   *_nc_tic_expand(
++               const char *srcp, 
++               NCURSES_BOOL tic_format, 
++               int     numbers)
++               { return(*(char **)0); }
++
++/* ./tinfo/comp_parse.c */
++
++#undef _nc_check_termtype2
++void   (*_nc_check_termtype2)(
++               TERMTYPE *p1, 
++               NCURSES_BOOL p2);
++#undef _nc_check_termtype
++void   (*_nc_check_termtype)(
++               TERMTYPE *p1);
++
++#undef _nc_entry_match
++NCURSES_BOOL _nc_entry_match(
++               char    *n1, 
++               char    *n2)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_read_entry_source
++void   _nc_read_entry_source(
++               FILE    *fp, 
++               char    *buf, 
++               int     literal, 
++               NCURSES_BOOL silent, 
++               NCURSES_BOOL (*hook)(
++               ENTRY   *p1))
++               { /* void */ }
++
++#undef _nc_resolve_uses2
++int    _nc_resolve_uses2(
++               NCURSES_BOOL fullresolve, 
++               NCURSES_BOOL literal)
++               { return(*(int *)0); }
++
++#undef _nc_resolve_uses
++int    _nc_resolve_uses(
++               NCURSES_BOOL fullresolve)
++               { return(*(int *)0); }
++
++/* ./tinfo/comp_scan.c */
++
++#undef _nc_syntax
++int    _nc_syntax;
++#undef _nc_strict_bsd
++int    _nc_strict_bsd;
++#undef _nc_curr_file_pos
++long   _nc_curr_file_pos;
++#undef _nc_comment_start
++long   _nc_comment_start;
++#undef _nc_comment_end
++long   _nc_comment_end;
++#undef _nc_start_line
++long   _nc_start_line;
++#undef _nc_curr_token
++struct token _nc_curr_token;
++#undef _nc_disable_period
++NCURSES_BOOL _nc_disable_period;
++
++#undef _nc_reset_input
++void   _nc_reset_input(
++               FILE    *fp, 
++               char    *buf)
++               { /* void */ }
++
++#undef _nc_get_token
++int    _nc_get_token(
++               NCURSES_BOOL silent)
++               { return(*(int *)0); }
++
++#undef _nc_trans_string
++int    _nc_trans_string(
++               char    *ptr, 
++               char    *last)
++               { return(*(int *)0); }
++
++#undef _nc_push_token
++void   _nc_push_token(
++               int     tokclass)
++               { /* void */ }
++
++#undef _nc_panic_mode
++void   _nc_panic_mode(
++               char    ch)
++               { /* void */ }
++
++/* ./tinfo/parse_entry.c */
++
++#undef _nc_parse_entry
++int    _nc_parse_entry(
++               struct entry *entryp, 
++               int     literal, 
++               NCURSES_BOOL silent)
++               { return(*(int *)0); }
++
++#undef _nc_capcmp
++int    _nc_capcmp(
++               const char *s, 
++               const char *t)
++               { return(*(int *)0); }
++
++typedef struct {
++    const char *from;
++    const char *to;
++} assoc;
++
++/* ./tinfo/write_entry.c */
++
++#include <hashed_db.h>
++
++#undef _nc_set_writedir
++void   _nc_set_writedir(
++               char    *dir)
++               { /* void */ }
++
++#undef _nc_write_entry
++void   _nc_write_entry(
++               TERMTYPE *const tp)
++               { /* void */ }
++
++#undef _nc_tic_written
++int    _nc_tic_written(void)
++               { return(*(int *)0); }
+diff -Naur ncurses-5.9.orig/ncurses/llib-ltictw ncurses-5.9/ncurses/llib-ltictw
+--- ncurses-5.9.orig/ncurses/llib-ltictw        1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/ncurses/llib-ltictw     2012-08-25 19:58:01.856555996 +0000
+@@ -0,0 +1,212 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey 2012                                           *
++ ****************************************************************************/
++/* LINTLIBRARY */
++
++/* ./tinfo/alloc_entry.c */
++
++#include <curses.priv.h>
++#include <tic.h>
++
++#undef _nc_init_entry
++void   _nc_init_entry(
++               TERMTYPE *const tp)
++               { /* void */ }
++
++#undef _nc_copy_entry
++ENTRY  *_nc_copy_entry(
++               ENTRY   *oldp)
++               { return(*(ENTRY **)0); }
++
++#undef _nc_save_str
++char   *_nc_save_str(
++               const char *const string)
++               { return(*(char **)0); }
++
++#undef _nc_wrap_entry
++void   _nc_wrap_entry(
++               ENTRY   *const ep, 
++               NCURSES_BOOL copy_strings)
++               { /* void */ }
++
++#undef _nc_merge_entry
++void   _nc_merge_entry(
++               TERMTYPE *const to, 
++               TERMTYPE *const from)
++               { /* void */ }
++
++/* ./tinfo/captoinfo.c */
++
++#include <ctype.h>
++
++#undef _nc_captoinfo
++char   *_nc_captoinfo(
++               const char *cap, 
++               const char *s, 
++               int const parameterized)
++               { return(*(char **)0); }
++
++#undef _nc_infotocap
++char   *_nc_infotocap(
++               const char *cap, 
++               const char *str, 
++               int const parameterized)
++               { return(*(char **)0); }
++
++/* ./tinfo/comp_expand.c */
++
++#undef _nc_tic_expand
++char   *_nc_tic_expand(
++               const char *srcp, 
++               NCURSES_BOOL tic_format, 
++               int     numbers)
++               { return(*(char **)0); }
++
++/* ./tinfo/comp_parse.c */
++
++#undef _nc_check_termtype2
++void   (*_nc_check_termtype2)(
++               TERMTYPE *p1, 
++               NCURSES_BOOL p2);
++#undef _nc_check_termtype
++void   (*_nc_check_termtype)(
++               TERMTYPE *p1);
++
++#undef _nc_entry_match
++NCURSES_BOOL _nc_entry_match(
++               char    *n1, 
++               char    *n2)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_read_entry_source
++void   _nc_read_entry_source(
++               FILE    *fp, 
++               char    *buf, 
++               int     literal, 
++               NCURSES_BOOL silent, 
++               NCURSES_BOOL (*hook)(
++               ENTRY   *p1))
++               { /* void */ }
++
++#undef _nc_resolve_uses2
++int    _nc_resolve_uses2(
++               NCURSES_BOOL fullresolve, 
++               NCURSES_BOOL literal)
++               { return(*(int *)0); }
++
++#undef _nc_resolve_uses
++int    _nc_resolve_uses(
++               NCURSES_BOOL fullresolve)
++               { return(*(int *)0); }
++
++/* ./tinfo/comp_scan.c */
++
++#undef _nc_syntax
++int    _nc_syntax;
++#undef _nc_strict_bsd
++int    _nc_strict_bsd;
++#undef _nc_curr_file_pos
++long   _nc_curr_file_pos;
++#undef _nc_comment_start
++long   _nc_comment_start;
++#undef _nc_comment_end
++long   _nc_comment_end;
++#undef _nc_start_line
++long   _nc_start_line;
++#undef _nc_curr_token
++struct token _nc_curr_token;
++#undef _nc_disable_period
++NCURSES_BOOL _nc_disable_period;
++
++#undef _nc_reset_input
++void   _nc_reset_input(
++               FILE    *fp, 
++               char    *buf)
++               { /* void */ }
++
++#undef _nc_get_token
++int    _nc_get_token(
++               NCURSES_BOOL silent)
++               { return(*(int *)0); }
++
++#undef _nc_trans_string
++int    _nc_trans_string(
++               char    *ptr, 
++               char    *last)
++               { return(*(int *)0); }
++
++#undef _nc_push_token
++void   _nc_push_token(
++               int     tokclass)
++               { /* void */ }
++
++#undef _nc_panic_mode
++void   _nc_panic_mode(
++               char    ch)
++               { /* void */ }
++
++/* ./tinfo/parse_entry.c */
++
++#undef _nc_parse_entry
++int    _nc_parse_entry(
++               struct entry *entryp, 
++               int     literal, 
++               NCURSES_BOOL silent)
++               { return(*(int *)0); }
++
++#undef _nc_capcmp
++int    _nc_capcmp(
++               const char *s, 
++               const char *t)
++               { return(*(int *)0); }
++
++typedef struct {
++    const char *from;
++    const char *to;
++} assoc;
++
++/* ./tinfo/write_entry.c */
++
++#include <hashed_db.h>
++
++#undef _nc_set_writedir
++void   _nc_set_writedir(
++               char    *dir)
++               { /* void */ }
++
++#undef _nc_write_entry
++void   _nc_write_entry(
++               TERMTYPE *const tp)
++               { /* void */ }
++
++#undef _nc_tic_written
++int    _nc_tic_written(void)
++               { return(*(int *)0); }
+diff -Naur ncurses-5.9.orig/ncurses/llib-lticw ncurses-5.9/ncurses/llib-lticw
+--- ncurses-5.9.orig/ncurses/llib-lticw 1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/ncurses/llib-lticw      2012-08-25 19:58:01.856555996 +0000
+@@ -0,0 +1,212 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey 2012                                           *
++ ****************************************************************************/
++/* LINTLIBRARY */
++
++/* ./tinfo/alloc_entry.c */
++
++#include <curses.priv.h>
++#include <tic.h>
++
++#undef _nc_init_entry
++void   _nc_init_entry(
++               TERMTYPE *const tp)
++               { /* void */ }
++
++#undef _nc_copy_entry
++ENTRY  *_nc_copy_entry(
++               ENTRY   *oldp)
++               { return(*(ENTRY **)0); }
++
++#undef _nc_save_str
++char   *_nc_save_str(
++               const char *const string)
++               { return(*(char **)0); }
++
++#undef _nc_wrap_entry
++void   _nc_wrap_entry(
++               ENTRY   *const ep, 
++               NCURSES_BOOL copy_strings)
++               { /* void */ }
++
++#undef _nc_merge_entry
++void   _nc_merge_entry(
++               TERMTYPE *const to, 
++               TERMTYPE *const from)
++               { /* void */ }
++
++/* ./tinfo/captoinfo.c */
++
++#include <ctype.h>
++
++#undef _nc_captoinfo
++char   *_nc_captoinfo(
++               const char *cap, 
++               const char *s, 
++               int const parameterized)
++               { return(*(char **)0); }
++
++#undef _nc_infotocap
++char   *_nc_infotocap(
++               const char *cap, 
++               const char *str, 
++               int const parameterized)
++               { return(*(char **)0); }
++
++/* ./tinfo/comp_expand.c */
++
++#undef _nc_tic_expand
++char   *_nc_tic_expand(
++               const char *srcp, 
++               NCURSES_BOOL tic_format, 
++               int     numbers)
++               { return(*(char **)0); }
++
++/* ./tinfo/comp_parse.c */
++
++#undef _nc_check_termtype2
++void   (*_nc_check_termtype2)(
++               TERMTYPE *p1, 
++               NCURSES_BOOL p2);
++#undef _nc_check_termtype
++void   (*_nc_check_termtype)(
++               TERMTYPE *p1);
++
++#undef _nc_entry_match
++NCURSES_BOOL _nc_entry_match(
++               char    *n1, 
++               char    *n2)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_read_entry_source
++void   _nc_read_entry_source(
++               FILE    *fp, 
++               char    *buf, 
++               int     literal, 
++               NCURSES_BOOL silent, 
++               NCURSES_BOOL (*hook)(
++               ENTRY   *p1))
++               { /* void */ }
++
++#undef _nc_resolve_uses2
++int    _nc_resolve_uses2(
++               NCURSES_BOOL fullresolve, 
++               NCURSES_BOOL literal)
++               { return(*(int *)0); }
++
++#undef _nc_resolve_uses
++int    _nc_resolve_uses(
++               NCURSES_BOOL fullresolve)
++               { return(*(int *)0); }
++
++/* ./tinfo/comp_scan.c */
++
++#undef _nc_syntax
++int    _nc_syntax;
++#undef _nc_strict_bsd
++int    _nc_strict_bsd;
++#undef _nc_curr_file_pos
++long   _nc_curr_file_pos;
++#undef _nc_comment_start
++long   _nc_comment_start;
++#undef _nc_comment_end
++long   _nc_comment_end;
++#undef _nc_start_line
++long   _nc_start_line;
++#undef _nc_curr_token
++struct token _nc_curr_token;
++#undef _nc_disable_period
++NCURSES_BOOL _nc_disable_period;
++
++#undef _nc_reset_input
++void   _nc_reset_input(
++               FILE    *fp, 
++               char    *buf)
++               { /* void */ }
++
++#undef _nc_get_token
++int    _nc_get_token(
++               NCURSES_BOOL silent)
++               { return(*(int *)0); }
++
++#undef _nc_trans_string
++int    _nc_trans_string(
++               char    *ptr, 
++               char    *last)
++               { return(*(int *)0); }
++
++#undef _nc_push_token
++void   _nc_push_token(
++               int     tokclass)
++               { /* void */ }
++
++#undef _nc_panic_mode
++void   _nc_panic_mode(
++               char    ch)
++               { /* void */ }
++
++/* ./tinfo/parse_entry.c */
++
++#undef _nc_parse_entry
++int    _nc_parse_entry(
++               struct entry *entryp, 
++               int     literal, 
++               NCURSES_BOOL silent)
++               { return(*(int *)0); }
++
++#undef _nc_capcmp
++int    _nc_capcmp(
++               const char *s, 
++               const char *t)
++               { return(*(int *)0); }
++
++typedef struct {
++    const char *from;
++    const char *to;
++} assoc;
++
++/* ./tinfo/write_entry.c */
++
++#include <hashed_db.h>
++
++#undef _nc_set_writedir
++void   _nc_set_writedir(
++               char    *dir)
++               { /* void */ }
++
++#undef _nc_write_entry
++void   _nc_write_entry(
++               TERMTYPE *const tp)
++               { /* void */ }
++
++#undef _nc_tic_written
++int    _nc_tic_written(void)
++               { return(*(int *)0); }
+diff -Naur ncurses-5.9.orig/ncurses/llib-ltinfo ncurses-5.9/ncurses/llib-ltinfo
+--- ncurses-5.9.orig/ncurses/llib-ltinfo        1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/ncurses/llib-ltinfo     2012-08-25 19:58:01.999888649 +0000
+@@ -0,0 +1,1504 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey 2012                                           *
++ ****************************************************************************/
++/* LINTLIBRARY */
++
++/* ./tinfo/access.c */
++
++#include <curses.priv.h>
++#include <ctype.h>
++#include <tic.h>
++
++#undef _nc_rootname
++char   *_nc_rootname(
++               char    *path)
++               { return(*(char **)0); }
++
++#undef _nc_is_abs_path
++NCURSES_BOOL _nc_is_abs_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_pathlast
++unsigned _nc_pathlast(
++               const char *path)
++               { return(*(unsigned *)0); }
++
++#undef _nc_basename
++char   *_nc_basename(
++               char    *path)
++               { return(*(char **)0); }
++
++#undef _nc_access
++int    _nc_access(
++               const char *path, 
++               int     mode)
++               { return(*(int *)0); }
++
++#undef _nc_is_dir_path
++NCURSES_BOOL _nc_is_dir_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_is_file_path
++NCURSES_BOOL _nc_is_file_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_env_access
++int    _nc_env_access(void)
++               { return(*(int *)0); }
++
++/* ./tinfo/add_tries.c */
++
++#undef _nc_add_to_try
++int    _nc_add_to_try(
++               TRIES   **tree, 
++               const char *str, 
++               unsigned code)
++               { return(*(int *)0); }
++
++/* ./tinfo/alloc_ttype.c */
++
++#undef _nc_align_termtype
++void   _nc_align_termtype(
++               TERMTYPE *to, 
++               TERMTYPE *from)
++               { /* void */ }
++
++#undef _nc_copy_termtype
++void   _nc_copy_termtype(
++               TERMTYPE *dst, 
++               const TERMTYPE *src)
++               { /* void */ }
++
++/* ./codes.c */
++
++#undef boolcodes
++char   *const boolcodes[] = {0};
++#undef numcodes
++char   *const numcodes[] = {0};
++#undef strcodes
++char   *const strcodes[] = {0};
++
++/* ./comp_captab.c */
++
++#include <hashsize.h>
++
++#undef _nc_get_table
++const struct name_table_entry *_nc_get_table(
++               NCURSES_BOOL termcap)
++               { return(*(const struct name_table_entry **)0); }
++
++#undef _nc_get_hash_table
++const HashValue *_nc_get_hash_table(
++               NCURSES_BOOL termcap)
++               { return(*(const HashValue **)0); }
++
++#undef _nc_get_alias_table
++const struct alias *_nc_get_alias_table(
++               NCURSES_BOOL termcap)
++               { return(*(const struct alias **)0); }
++
++#undef _nc_get_hash_info
++const HashData *_nc_get_hash_info(
++               NCURSES_BOOL termcap)
++               { return(*(const HashData **)0); }
++
++/* ./tinfo/comp_error.c */
++
++#undef _nc_suppress_warnings
++NCURSES_BOOL _nc_suppress_warnings;
++#undef _nc_curr_line
++int    _nc_curr_line;
++#undef _nc_curr_col
++int    _nc_curr_col;
++
++#undef _nc_get_source
++const char *_nc_get_source(void)
++               { return(*(const char **)0); }
++
++#undef _nc_set_source
++void   _nc_set_source(
++               const char *const name)
++               { /* void */ }
++
++#undef _nc_set_type
++void   _nc_set_type(
++               const char *const name)
++               { /* void */ }
++
++#undef _nc_get_type
++void   _nc_get_type(
++               char    *name)
++               { /* void */ }
++
++#undef _nc_warning
++void   _nc_warning(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_err_abort
++void   _nc_err_abort(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_syserr_abort
++void   _nc_syserr_abort(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++/* ./tinfo/comp_hash.c */
++
++#undef _nc_find_entry
++struct name_table_entry const *_nc_find_entry(
++               const char *string, 
++               const HashValue *hash_table)
++               { return(*(struct name_table_entry const **)0); }
++
++#undef _nc_find_type_entry
++struct name_table_entry const *_nc_find_type_entry(
++               const char *string, 
++               int     type, 
++               NCURSES_BOOL termcap)
++               { return(*(struct name_table_entry const **)0); }
++
++/* ./tinfo/db_iterator.c */
++
++#include <time.h>
++
++#undef _nc_tic_dir
++const char *_nc_tic_dir(
++               const char *path)
++               { return(*(const char **)0); }
++
++#undef _nc_keep_tic_dir
++void   _nc_keep_tic_dir(
++               const char *path)
++               { /* void */ }
++
++#undef _nc_last_db
++void   _nc_last_db(void)
++               { /* void */ }
++
++#undef _nc_next_db
++const char *_nc_next_db(
++               DBDIRS  *state, 
++               int     *offset)
++               { return(*(const char **)0); }
++
++#undef _nc_first_db
++void   _nc_first_db(
++               DBDIRS  *state, 
++               int     *offset)
++               { /* void */ }
++
++/* ./tinfo/doalloc.c */
++
++#undef _nc_doalloc
++void   *_nc_doalloc(
++               void    *oldp, 
++               size_t  amount)
++               { return(*(void **)0); }
++
++/* ./tinfo/entries.c */
++
++#undef _nc_head
++ENTRY  *_nc_head;
++#undef _nc_tail
++ENTRY  *_nc_tail;
++
++#undef _nc_free_entry
++void   _nc_free_entry(
++               ENTRY   *headp, 
++               TERMTYPE *tterm)
++               { /* void */ }
++
++#undef _nc_free_entries
++void   _nc_free_entries(
++               ENTRY   *headp)
++               { /* void */ }
++
++#undef _nc_delink_entry
++ENTRY  *_nc_delink_entry(
++               ENTRY   *headp, 
++               TERMTYPE *tterm)
++               { return(*(ENTRY **)0); }
++
++#undef _nc_leaks_tinfo
++void   _nc_leaks_tinfo(void)
++               { /* void */ }
++
++/* ./fallback.c */
++
++#undef _nc_fallback
++const TERMTYPE *_nc_fallback(
++               const char *name)
++               { return(*(const TERMTYPE **)0); }
++
++/* ./tinfo/free_ttype.c */
++
++#undef _nc_free_termtype
++void   _nc_free_termtype(
++               TERMTYPE *ptr)
++               { /* void */ }
++
++#undef _nc_user_definable
++NCURSES_BOOL _nc_user_definable;
++
++#undef use_extended_names
++int    use_extended_names(
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/getenv_num.c */
++
++#undef _nc_getenv_num
++int    _nc_getenv_num(
++               const char *name)
++               { return(*(int *)0); }
++
++/* ./tinfo/home_terminfo.c */
++
++#undef _nc_home_terminfo
++char   *_nc_home_terminfo(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/init_keytry.c */
++
++#if 0
++
++#include <init_keytry.h>
++
++#undef _nc_tinfo_fkeys
++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
++
++#endif
++
++#undef _nc_init_keytry
++void   _nc_init_keytry(
++               SCREEN  *sp)
++               { /* void */ }
++
++/* ./tinfo/lib_acs.c */
++
++#undef acs_map
++chtype acs_map[128];
++
++#undef _nc_init_acs_sp
++void   _nc_init_acs_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_init_acs
++void   _nc_init_acs(void)
++               { /* void */ }
++
++/* ./tinfo/lib_baudrate.c */
++
++#include <termcap.h>
++
++struct speed {
++    int s; 
++    int sp; 
++};
++
++#undef _nc_baudrate
++int    _nc_baudrate(
++               int     OSpeed)
++               { return(*(int *)0); }
++
++#undef _nc_ospeed
++int    _nc_ospeed(
++               int     BaudRate)
++               { return(*(int *)0); }
++
++#undef baudrate_sp
++int    baudrate_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef baudrate
++int    baudrate(void)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_cur_term.c */
++
++#undef cur_term
++TERMINAL *cur_term;
++
++#undef set_curterm_sp
++TERMINAL *set_curterm_sp(
++               SCREEN  *sp, 
++               TERMINAL *termp)
++               { return(*(TERMINAL **)0); }
++
++#undef set_curterm
++TERMINAL *set_curterm(
++               TERMINAL *termp)
++               { return(*(TERMINAL **)0); }
++
++#undef del_curterm_sp
++int    del_curterm_sp(
++               SCREEN  *sp, 
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++#undef del_curterm
++int    del_curterm(
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_data.c */
++
++#undef stdscr
++WINDOW *stdscr;
++#undef curscr
++WINDOW *curscr;
++#undef newscr
++WINDOW *newscr;
++#undef _nc_screen_chain
++SCREEN *_nc_screen_chain;
++#undef SP
++SCREEN *SP;
++#undef _nc_globals
++NCURSES_GLOBALS _nc_globals;
++#undef _nc_prescreen
++NCURSES_PRESCREEN _nc_prescreen;
++
++#undef _nc_screen_of
++SCREEN *_nc_screen_of(
++               WINDOW  *win)
++               { return(*(SCREEN **)0); }
++
++/* ./tinfo/lib_has_cap.c */
++
++#undef has_ic_sp
++NCURSES_BOOL has_ic_sp(
++               SCREEN  *sp)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_ic
++NCURSES_BOOL has_ic(void)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_il_sp
++NCURSES_BOOL has_il_sp(
++               SCREEN  *sp)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_il
++NCURSES_BOOL has_il(void)
++               { return(*(NCURSES_BOOL *)0); }
++
++/* ./tinfo/lib_kernel.c */
++
++#undef erasechar_sp
++char   erasechar_sp(
++               SCREEN  *sp)
++               { return(*(char *)0); }
++
++#undef erasechar
++char   erasechar(void)
++               { return(*(char *)0); }
++
++#undef killchar_sp
++char   killchar_sp(
++               SCREEN  *sp)
++               { return(*(char *)0); }
++
++#undef killchar
++char   killchar(void)
++               { return(*(char *)0); }
++
++#undef flushinp_sp
++int    flushinp_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef flushinp
++int    flushinp(void)
++               { return(*(int *)0); }
++
++/* ./lib_keyname.c */
++
++struct kn { short offset; int code; };
++
++#undef keyname_sp
++char   *keyname_sp(
++               SCREEN  *sp, 
++               int     c)
++               { return(*(char **)0); }
++
++#undef keyname
++char   *keyname(
++               int     c)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_longname.c */
++
++#undef longname
++char   *longname(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_napms.c */
++
++#include <sys/time.h>
++
++#undef napms_sp
++int    napms_sp(
++               SCREEN  *sp, 
++               int     ms)
++               { return(*(int *)0); }
++
++#undef napms
++int    napms(
++               int     ms)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_options.c */
++
++#undef idlok
++int    idlok(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef idcok
++void   idcok(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { /* void */ }
++
++#undef halfdelay_sp
++int    halfdelay_sp(
++               SCREEN  *sp, 
++               int     t)
++               { return(*(int *)0); }
++
++#undef halfdelay
++int    halfdelay(
++               int     t)
++               { return(*(int *)0); }
++
++#undef nodelay
++int    nodelay(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef notimeout
++int    notimeout(
++               WINDOW  *win, 
++               NCURSES_BOOL f)
++               { return(*(int *)0); }
++
++#undef wtimeout
++void   wtimeout(
++               WINDOW  *win, 
++               int     delay)
++               { /* void */ }
++
++#undef keypad
++int    keypad(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef meta
++int    meta(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef curs_set_sp
++int    curs_set_sp(
++               SCREEN  *sp, 
++               int     vis)
++               { return(*(int *)0); }
++
++#undef curs_set
++int    curs_set(
++               int     vis)
++               { return(*(int *)0); }
++
++#undef typeahead_sp
++int    typeahead_sp(
++               SCREEN  *sp, 
++               int     fd)
++               { return(*(int *)0); }
++
++#undef typeahead
++int    typeahead(
++               int     fd)
++               { return(*(int *)0); }
++
++#undef has_key_sp
++int    has_key_sp(
++               SCREEN  *sp, 
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef has_key
++int    has_key(
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef _nc_putp_flush_sp
++int    _nc_putp_flush_sp(
++               SCREEN  *sp, 
++               const char *name, 
++               const char *value)
++               { return(*(int *)0); }
++
++#undef _nc_keypad
++int    _nc_keypad(
++               SCREEN  *sp, 
++               int     flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_raw.c */
++
++#undef raw_sp
++int    raw_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef raw
++int    raw(void)
++               { return(*(int *)0); }
++
++#undef cbreak_sp
++int    cbreak_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef cbreak
++int    cbreak(void)
++               { return(*(int *)0); }
++
++#undef qiflush_sp
++void   qiflush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef qiflush
++void   qiflush(void)
++               { /* void */ }
++
++#undef noraw_sp
++int    noraw_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef noraw
++int    noraw(void)
++               { return(*(int *)0); }
++
++#undef nocbreak_sp
++int    nocbreak_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef nocbreak
++int    nocbreak(void)
++               { return(*(int *)0); }
++
++#undef noqiflush_sp
++void   noqiflush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef noqiflush
++void   noqiflush(void)
++               { /* void */ }
++
++#undef intrflush_sp
++int    intrflush_sp(
++               SCREEN  *sp, 
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef intrflush
++int    intrflush(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_setup.c */
++
++#include <locale.h>
++#include <sys/ioctl.h>
++#include <langinfo.h>
++
++#undef ttytype
++char   ttytype[256];
++#undef LINES
++int    LINES;
++#undef COLS
++int    COLS;
++#undef TABSIZE
++int    TABSIZE;
++
++#undef set_tabsize_sp
++int    set_tabsize_sp(
++               SCREEN  *sp, 
++               int     value)
++               { return(*(int *)0); }
++
++#undef set_tabsize
++int    set_tabsize(
++               int     value)
++               { return(*(int *)0); }
++
++#undef _nc_handle_sigwinch
++int    _nc_handle_sigwinch(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef use_env_sp
++void   use_env_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_env
++void   use_env(
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl
++void   use_tioctl(
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef _nc_get_screensize
++void   _nc_get_screensize(
++               SCREEN  *sp, 
++               int     *linep, 
++               int     *colp)
++               { /* void */ }
++
++#undef _nc_update_screensize
++void   _nc_update_screensize(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_setup_tinfo
++int    _nc_setup_tinfo(
++               const char *const tn, 
++               TERMTYPE *const tp)
++               { return(*(int *)0); }
++
++#undef _nc_tinfo_cmdch
++void   _nc_tinfo_cmdch(
++               TERMINAL *termp, 
++               int     proto)
++               { /* void */ }
++
++#undef _nc_get_locale
++char   *_nc_get_locale(void)
++               { return(*(char **)0); }
++
++#undef _nc_unicode_locale
++int    _nc_unicode_locale(void)
++               { return(*(int *)0); }
++
++#undef _nc_locale_breaks_acs
++int    _nc_locale_breaks_acs(
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++#undef _nc_setupterm
++int    _nc_setupterm(
++               char    *tname, 
++               int     Filedes, 
++               int     *errret, 
++               int     reuse)
++               { return(*(int *)0); }
++
++#undef new_prescr
++SCREEN *new_prescr(void)
++               { return(*(SCREEN **)0); }
++
++#undef setupterm
++int    setupterm(
++               char    *tname, 
++               int     Filedes, 
++               int     *errret)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_termcap.c */
++
++#undef UP
++char   *UP;
++#undef BC
++char   *BC;
++
++#undef tgetent_sp
++int    tgetent_sp(
++               SCREEN  *sp, 
++               char    *bufp, 
++               const char *name)
++               { return(*(int *)0); }
++
++#if 0
++
++#include <capdefaults.c>
++
++#endif
++
++#undef tgetent
++int    tgetent(
++               char    *bufp, 
++               const char *name)
++               { return(*(int *)0); }
++
++#undef tgetflag_sp
++int    tgetflag_sp(
++               SCREEN  *sp, 
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetflag
++int    tgetflag(
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetnum_sp
++int    tgetnum_sp(
++               SCREEN  *sp, 
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetnum
++int    tgetnum(
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetstr_sp
++char   *tgetstr_sp(
++               SCREEN  *sp, 
++               char    *id, 
++               char    **area)
++               { return(*(char **)0); }
++
++#undef tgetstr
++char   *tgetstr(
++               char    *id, 
++               char    **area)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_termname.c */
++
++#undef termname_sp
++char   *termname_sp(
++               SCREEN  *sp)
++               { return(*(char **)0); }
++
++#undef termname
++char   *termname(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tgoto.c */
++
++#undef tgoto
++char   *tgoto(
++               const char *string, 
++               int     x, 
++               int     y)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_ti.c */
++
++#undef tigetflag_sp
++int    tigetflag_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetflag
++int    tigetflag(
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetnum_sp
++int    tigetnum_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetnum
++int    tigetnum(
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetstr_sp
++char   *tigetstr_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(char **)0); }
++
++#undef tigetstr
++char   *tigetstr(
++               char    *str)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tparm.c */
++
++#undef _nc_tparm_err
++int    _nc_tparm_err;
++
++#undef _nc_tparm_analyze
++int    _nc_tparm_analyze(
++               const char *string, 
++               char    *p_is_s[9], 
++               int     *popcount)
++               { return(*(int *)0); }
++
++#undef tparm
++char   *tparm(
++               char    *string, 
++               ...)
++               { return(*(char **)0); }
++
++#undef tiparm
++char   *tiparm(
++               const char *string, 
++               ...)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tputs.c */
++
++#undef PC
++char   PC;
++#undef ospeed
++short  ospeed;
++#undef _nc_nulls_sent
++int    _nc_nulls_sent;
++
++#undef _nc_set_no_padding
++void   _nc_set_no_padding(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef delay_output_sp
++int    delay_output_sp(
++               SCREEN  *sp, 
++               int     ms)
++               { return(*(int *)0); }
++
++#undef delay_output
++int    delay_output(
++               int     ms)
++               { return(*(int *)0); }
++
++#undef _nc_flush_sp
++void   _nc_flush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_flush
++void   _nc_flush(void)
++               { /* void */ }
++
++#undef _nc_outch_sp
++int    _nc_outch_sp(
++               SCREEN  *sp, 
++               int     ch)
++               { return(*(int *)0); }
++
++#undef _nc_outch
++int    _nc_outch(
++               int     ch)
++               { return(*(int *)0); }
++
++#undef putp_sp
++int    putp_sp(
++               SCREEN  *sp, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef _nc_putp_sp
++int    _nc_putp_sp(
++               SCREEN  *sp, 
++               const char *name, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef putp
++int    putp(
++               const char *string)
++               { return(*(int *)0); }
++
++#undef _nc_putp
++int    _nc_putp(
++               const char *name, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef tputs_sp
++int    tputs_sp(
++               SCREEN  *sp, 
++               const char *string, 
++               int     affcnt, 
++               NCURSES_OUTC_sp outc)
++               { return(*(int *)0); }
++
++#undef _nc_outc_wrapper
++int    _nc_outc_wrapper(
++               SCREEN  *sp, 
++               int     c)
++               { return(*(int *)0); }
++
++#undef tputs
++int    tputs(
++               const char *string, 
++               int     affcnt, 
++               int     (*outc)(
++               int     p1))
++               { return(*(int *)0); }
++
++/* ./trace/lib_trace.c */
++
++#undef _nc_tracing
++unsigned _nc_tracing;
++#undef _nc_tputs_trace
++const char *_nc_tputs_trace = {0};
++#undef _nc_outchars
++long   _nc_outchars;
++
++#undef trace
++void   trace(
++               const unsigned int tracelevel)
++               { /* void */ }
++
++#undef _tracef
++void   _tracef(
++               const char *fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_retrace_bool
++NCURSES_BOOL _nc_retrace_bool(
++               int     code)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_retrace_char
++char   _nc_retrace_char(
++               int     code)
++               { return(*(char *)0); }
++
++#undef _nc_retrace_int
++int    _nc_retrace_int(
++               int     code)
++               { return(*(int *)0); }
++
++#undef _nc_retrace_unsigned
++unsigned _nc_retrace_unsigned(
++               unsigned code)
++               { return(*(unsigned *)0); }
++
++#undef _nc_retrace_ptr
++char   *_nc_retrace_ptr(
++               char    *code)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_cptr
++const char *_nc_retrace_cptr(
++               const char *code)
++               { return(*(const char **)0); }
++
++#undef _nc_retrace_cvoid_ptr
++void   *_nc_retrace_cvoid_ptr(
++               void    *code)
++               { return(*(void **)0); }
++
++#undef _nc_retrace_void_ptr
++void   *_nc_retrace_void_ptr(
++               void    *code)
++               { return(*(void **)0); }
++
++#undef _nc_retrace_sp
++SCREEN *_nc_retrace_sp(
++               SCREEN  *code)
++               { return(*(SCREEN **)0); }
++
++#undef _nc_retrace_win
++WINDOW *_nc_retrace_win(
++               WINDOW  *code)
++               { return(*(WINDOW **)0); }
++
++/* ./trace/lib_traceatr.c */
++
++#undef _traceattr2
++char   *_traceattr2(
++               int     bufnum, 
++               chtype  newmode)
++               { return(*(char **)0); }
++
++#undef _traceattr
++char   *_traceattr(
++               attr_t  newmode)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_int_attr_t
++int    _nc_retrace_int_attr_t(
++               attr_t  code)
++               { return(*(int *)0); }
++
++#undef _nc_retrace_attr_t
++attr_t _nc_retrace_attr_t(
++               attr_t  code)
++               { return(*(attr_t *)0); }
++
++#undef _nc_altcharset_name
++const char *_nc_altcharset_name(
++               attr_t  attr, 
++               chtype  ch)
++               { return(*(const char **)0); }
++
++#undef _tracechtype2
++char   *_tracechtype2(
++               int     bufnum, 
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef _tracechtype
++char   *_tracechtype(
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_chtype
++chtype _nc_retrace_chtype(
++               chtype  code)
++               { return(*(chtype *)0); }
++
++/* ./trace/lib_tracebits.c */
++
++typedef struct {
++    unsigned int val;
++    const char *name;
++} BITNAMES;
++
++#undef _nc_trace_ttymode
++char   *_nc_trace_ttymode(
++               struct termios *tty)
++               { return(*(char **)0); }
++
++#undef _nc_tracebits
++char   *_nc_tracebits(void)
++               { return(*(char **)0); }
++
++/* ./trace/lib_tracechr.c */
++
++#undef _nc_tracechar
++char   *_nc_tracechar(
++               SCREEN  *sp, 
++               int     ch)
++               { return(*(char **)0); }
++
++#undef _tracechar
++char   *_tracechar(
++               int     ch)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_ttyflags.c */
++
++#undef _nc_get_tty_mode_sp
++int    _nc_get_tty_mode_sp(
++               SCREEN  *sp, 
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_get_tty_mode
++int    _nc_get_tty_mode(
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_set_tty_mode_sp
++int    _nc_set_tty_mode_sp(
++               SCREEN  *sp, 
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_set_tty_mode
++int    _nc_set_tty_mode(
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef def_shell_mode_sp
++int    def_shell_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef def_shell_mode
++int    def_shell_mode(void)
++               { return(*(int *)0); }
++
++#undef def_prog_mode_sp
++int    def_prog_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef def_prog_mode
++int    def_prog_mode(void)
++               { return(*(int *)0); }
++
++#undef reset_prog_mode_sp
++int    reset_prog_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef reset_prog_mode
++int    reset_prog_mode(void)
++               { return(*(int *)0); }
++
++#undef reset_shell_mode_sp
++int    reset_shell_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef reset_shell_mode
++int    reset_shell_mode(void)
++               { return(*(int *)0); }
++
++#undef savetty_sp
++int    savetty_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef savetty
++int    savetty(void)
++               { return(*(int *)0); }
++
++#undef resetty_sp
++int    resetty_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef resetty
++int    resetty(void)
++               { return(*(int *)0); }
++
++/* ./tty/lib_twait.c */
++
++#undef _nc_timed_wait
++int    _nc_timed_wait(
++               SCREEN  *sp, 
++               int     mode, 
++               int     milliseconds, 
++               int     *timeleft)
++               { return(*(int *)0); }
++
++/* ./tinfo/name_match.c */
++
++#undef _nc_first_name
++char   *_nc_first_name(
++               const char *const sp)
++               { return(*(char **)0); }
++
++#undef _nc_name_match
++int    _nc_name_match(
++               const char *const namelst, 
++               const char *const name, 
++               const char *const delim)
++               { return(*(int *)0); }
++
++/* ./names.c */
++
++#undef boolnames
++char   *const boolnames[] = {0};
++#undef boolfnames
++char   *const boolfnames[] = {0};
++#undef numnames
++char   *const numnames[] = {0};
++#undef numfnames
++char   *const numfnames[] = {0};
++#undef strnames
++char   *const strnames[] = {0};
++#undef strfnames
++char   *const strfnames[] = {0};
++
++/* ./tinfo/read_entry.c */
++
++#include <hashed_db.h>
++
++#undef _nc_read_termtype
++int    _nc_read_termtype(
++               TERMTYPE *ptr, 
++               char    *buffer, 
++               int     limit)
++               { return(*(int *)0); }
++
++#undef _nc_read_file_entry
++int    _nc_read_file_entry(
++               const char *const filename, 
++               TERMTYPE *ptr)
++               { return(*(int *)0); }
++
++#undef _nc_read_entry
++int    _nc_read_entry(
++               const char *const name, 
++               char    *const filename, 
++               TERMTYPE *const tp)
++               { return(*(int *)0); }
++
++/* ./tinfo/read_termcap.c */
++
++#include <sys/types.h>
++
++#undef _nc_read_termcap
++void   _nc_read_termcap(void)
++               { /* void */ }
++
++/* ./tinfo/setbuf.c */
++
++#undef _nc_set_buffer_sp
++void   _nc_set_buffer_sp(
++               SCREEN  *sp, 
++               FILE    *ofp, 
++               int     buffered)
++               { /* void */ }
++
++#undef _nc_set_buffer
++void   _nc_set_buffer(
++               FILE    *ofp, 
++               int     buffered)
++               { /* void */ }
++
++/* ./tinfo/strings.c */
++
++#undef _nc_str_init
++string_desc *_nc_str_init(
++               string_desc *dst, 
++               char    *src, 
++               size_t  len)
++               { return(*(string_desc **)0); }
++
++#undef _nc_str_null
++string_desc *_nc_str_null(
++               string_desc *dst, 
++               size_t  len)
++               { return(*(string_desc **)0); }
++
++#undef _nc_str_copy
++string_desc *_nc_str_copy(
++               string_desc *dst, 
++               string_desc *src)
++               { return(*(string_desc **)0); }
++
++#undef _nc_safe_strcat
++NCURSES_BOOL _nc_safe_strcat(
++               string_desc *dst, 
++               const char *src)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_safe_strcpy
++NCURSES_BOOL _nc_safe_strcpy(
++               string_desc *dst, 
++               const char *src)
++               { return(*(NCURSES_BOOL *)0); }
++
++/* ./trace/trace_buf.c */
++
++#undef _nc_trace_buf
++char   *_nc_trace_buf(
++               int     bufnum, 
++               size_t  want)
++               { return(*(char **)0); }
++
++#undef _nc_trace_bufcat
++char   *_nc_trace_bufcat(
++               int     bufnum, 
++               const char *value)
++               { return(*(char **)0); }
++
++/* ./trace/trace_tries.c */
++
++#undef _nc_trace_tries
++void   _nc_trace_tries(
++               TRIES   *tree)
++               { /* void */ }
++
++/* ./base/tries.c */
++
++#undef _nc_expand_try
++char   *_nc_expand_try(
++               TRIES   *tree, 
++               unsigned code, 
++               int     *count, 
++               size_t  len)
++               { return(*(char **)0); }
++
++#undef _nc_remove_key
++int    _nc_remove_key(
++               TRIES   **tree, 
++               unsigned code)
++               { return(*(int *)0); }
++
++#undef _nc_remove_string
++int    _nc_remove_string(
++               TRIES   **tree, 
++               const char *string)
++               { return(*(int *)0); }
++
++/* ./tinfo/trim_sgr0.c */
++
++#undef _nc_trim_sgr0
++char   *_nc_trim_sgr0(
++               TERMTYPE *tp)
++               { return(*(char **)0); }
++
++/* ./unctrl.c */
++
++#undef unctrl_sp
++char   *unctrl_sp(
++               SCREEN  *sp, 
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef unctrl
++char   *unctrl(
++               chtype  ch)
++               { return(*(char **)0); }
++
++/* ./trace/visbuf.c */
++
++#undef _nc_visbuf2
++const char *_nc_visbuf2(
++               int     bufnum, 
++               const char *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_visbuf
++const char *_nc_visbuf(
++               const char *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_visbufn
++const char *_nc_visbufn(
++               const char *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viscbuf2
++const char *_nc_viscbuf2(
++               int     bufnum, 
++               const chtype *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viscbuf
++const char *_nc_viscbuf(
++               const chtype *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++/* ./base/define_key.c */
++
++#undef define_key_sp
++int    define_key_sp(
++               SCREEN  *sp, 
++               const char *str, 
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef define_key
++int    define_key(
++               const char *str, 
++               int     keycode)
++               { return(*(int *)0); }
++
++/* ./tinfo/hashed_db.c */
++
++#undef _nc_hashed_db
++void   _nc_hashed_db(void)
++               { /* void */ }
++
++/* ./base/key_defined.c */
++
++#undef key_defined_sp
++int    key_defined_sp(
++               SCREEN  *sp, 
++               const char *str)
++               { return(*(int *)0); }
++
++#undef key_defined
++int    key_defined(
++               const char *str)
++               { return(*(int *)0); }
++
++/* ./base/keybound.c */
++
++#undef keybound_sp
++char   *keybound_sp(
++               SCREEN  *sp, 
++               int     code, 
++               int     count)
++               { return(*(char **)0); }
++
++#undef keybound
++char   *keybound(
++               int     code, 
++               int     count)
++               { return(*(char **)0); }
++
++/* ./base/keyok.c */
++
++#undef keyok_sp
++int    keyok_sp(
++               SCREEN  *sp, 
++               int     c, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef keyok
++int    keyok(
++               int     c, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./base/version.c */
++
++#undef curses_version
++const char *curses_version(void)
++               { return(*(const char **)0); }
+diff -Naur ncurses-5.9.orig/ncurses/llib-ltinfotw ncurses-5.9/ncurses/llib-ltinfotw
+--- ncurses-5.9.orig/ncurses/llib-ltinfotw      1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/ncurses/llib-ltinfotw   2012-08-25 19:58:01.999888649 +0000
+@@ -0,0 +1,1646 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey 2012                                           *
++ ****************************************************************************/
++/* LINTLIBRARY */
++
++/* ./tinfo/access.c */
++
++#include <curses.priv.h>
++#include <ctype.h>
++#include <tic.h>
++
++#undef _nc_rootname
++char   *_nc_rootname(
++               char    *path)
++               { return(*(char **)0); }
++
++#undef _nc_is_abs_path
++NCURSES_BOOL _nc_is_abs_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_pathlast
++unsigned _nc_pathlast(
++               const char *path)
++               { return(*(unsigned *)0); }
++
++#undef _nc_basename
++char   *_nc_basename(
++               char    *path)
++               { return(*(char **)0); }
++
++#undef _nc_access
++int    _nc_access(
++               const char *path, 
++               int     mode)
++               { return(*(int *)0); }
++
++#undef _nc_is_dir_path
++NCURSES_BOOL _nc_is_dir_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_is_file_path
++NCURSES_BOOL _nc_is_file_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_env_access
++int    _nc_env_access(void)
++               { return(*(int *)0); }
++
++/* ./tinfo/add_tries.c */
++
++#undef _nc_add_to_try
++int    _nc_add_to_try(
++               TRIES   **tree, 
++               const char *str, 
++               unsigned code)
++               { return(*(int *)0); }
++
++/* ./tinfo/alloc_ttype.c */
++
++#undef _nc_align_termtype
++void   _nc_align_termtype(
++               TERMTYPE *to, 
++               TERMTYPE *from)
++               { /* void */ }
++
++#undef _nc_copy_termtype
++void   _nc_copy_termtype(
++               TERMTYPE *dst, 
++               const TERMTYPE *src)
++               { /* void */ }
++
++/* ./codes.c */
++
++#undef _nc_boolcodes
++char   *const *_nc_boolcodes(void)
++               { return(*(char **)0); }
++
++#undef _nc_numcodes
++char   *const *_nc_numcodes(void)
++               { return(*(char **)0); }
++
++#undef _nc_strcodes
++char   *const *_nc_strcodes(void)
++               { return(*(char **)0); }
++
++/* ./comp_captab.c */
++
++#include <hashsize.h>
++
++#undef _nc_get_table
++const struct name_table_entry *_nc_get_table(
++               NCURSES_BOOL termcap)
++               { return(*(const struct name_table_entry **)0); }
++
++#undef _nc_get_hash_table
++const HashValue *_nc_get_hash_table(
++               NCURSES_BOOL termcap)
++               { return(*(const HashValue **)0); }
++
++#undef _nc_get_alias_table
++const struct alias *_nc_get_alias_table(
++               NCURSES_BOOL termcap)
++               { return(*(const struct alias **)0); }
++
++#undef _nc_get_hash_info
++const HashData *_nc_get_hash_info(
++               NCURSES_BOOL termcap)
++               { return(*(const HashData **)0); }
++
++/* ./tinfo/comp_error.c */
++
++#undef _nc_suppress_warnings
++NCURSES_BOOL _nc_suppress_warnings;
++#undef _nc_curr_line
++int    _nc_curr_line;
++#undef _nc_curr_col
++int    _nc_curr_col;
++
++#undef _nc_get_source
++const char *_nc_get_source(void)
++               { return(*(const char **)0); }
++
++#undef _nc_set_source
++void   _nc_set_source(
++               const char *const name)
++               { /* void */ }
++
++#undef _nc_set_type
++void   _nc_set_type(
++               const char *const name)
++               { /* void */ }
++
++#undef _nc_get_type
++void   _nc_get_type(
++               char    *name)
++               { /* void */ }
++
++#undef _nc_warning
++void   _nc_warning(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_err_abort
++void   _nc_err_abort(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_syserr_abort
++void   _nc_syserr_abort(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++/* ./tinfo/comp_hash.c */
++
++#undef _nc_find_entry
++struct name_table_entry const *_nc_find_entry(
++               const char *string, 
++               const HashValue *hash_table)
++               { return(*(struct name_table_entry const **)0); }
++
++#undef _nc_find_type_entry
++struct name_table_entry const *_nc_find_type_entry(
++               const char *string, 
++               int     type, 
++               NCURSES_BOOL termcap)
++               { return(*(struct name_table_entry const **)0); }
++
++/* ./tinfo/db_iterator.c */
++
++#include <time.h>
++
++#undef _nc_tic_dir
++const char *_nc_tic_dir(
++               const char *path)
++               { return(*(const char **)0); }
++
++#undef _nc_keep_tic_dir
++void   _nc_keep_tic_dir(
++               const char *path)
++               { /* void */ }
++
++#undef _nc_last_db
++void   _nc_last_db(void)
++               { /* void */ }
++
++#undef _nc_next_db
++const char *_nc_next_db(
++               DBDIRS  *state, 
++               int     *offset)
++               { return(*(const char **)0); }
++
++#undef _nc_first_db
++void   _nc_first_db(
++               DBDIRS  *state, 
++               int     *offset)
++               { /* void */ }
++
++/* ./tinfo/doalloc.c */
++
++#undef _nc_doalloc
++void   *_nc_doalloc(
++               void    *oldp, 
++               size_t  amount)
++               { return(*(void **)0); }
++
++/* ./tinfo/entries.c */
++
++#undef _nc_head
++ENTRY  *_nc_head;
++#undef _nc_tail
++ENTRY  *_nc_tail;
++
++#undef _nc_free_entry
++void   _nc_free_entry(
++               ENTRY   *headp, 
++               TERMTYPE *tterm)
++               { /* void */ }
++
++#undef _nc_free_entries
++void   _nc_free_entries(
++               ENTRY   *headp)
++               { /* void */ }
++
++#undef _nc_delink_entry
++ENTRY  *_nc_delink_entry(
++               ENTRY   *headp, 
++               TERMTYPE *tterm)
++               { return(*(ENTRY **)0); }
++
++#undef _nc_leaks_tinfo
++void   _nc_leaks_tinfo(void)
++               { /* void */ }
++
++/* ./fallback.c */
++
++#undef _nc_fallback
++const TERMTYPE *_nc_fallback(
++               const char *name)
++               { return(*(const TERMTYPE **)0); }
++
++/* ./tinfo/free_ttype.c */
++
++#undef _nc_free_termtype
++void   _nc_free_termtype(
++               TERMTYPE *ptr)
++               { /* void */ }
++
++#undef _nc_user_definable
++NCURSES_BOOL _nc_user_definable;
++
++#undef use_extended_names
++int    use_extended_names(
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/getenv_num.c */
++
++#undef _nc_getenv_num
++int    _nc_getenv_num(
++               const char *name)
++               { return(*(int *)0); }
++
++/* ./tinfo/home_terminfo.c */
++
++#undef _nc_home_terminfo
++char   *_nc_home_terminfo(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/init_keytry.c */
++
++#if 0
++
++#include <init_keytry.h>
++
++#undef _nc_tinfo_fkeys
++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
++
++#endif
++
++#undef _nc_init_keytry
++void   _nc_init_keytry(
++               SCREEN  *sp)
++               { /* void */ }
++
++/* ./tinfo/lib_acs.c */
++
++#undef _nc_acs_map
++chtype *_nc_acs_map(void)
++               { return(*(chtype **)0); }
++
++#undef _nc_init_acs_sp
++void   _nc_init_acs_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_init_acs
++void   _nc_init_acs(void)
++               { /* void */ }
++
++/* ./tinfo/lib_baudrate.c */
++
++#include <termcap.h>
++
++struct speed {
++    int s; 
++    int sp; 
++};
++
++#undef _nc_baudrate
++int    _nc_baudrate(
++               int     OSpeed)
++               { return(*(int *)0); }
++
++#undef _nc_ospeed
++int    _nc_ospeed(
++               int     BaudRate)
++               { return(*(int *)0); }
++
++#undef baudrate_sp
++int    baudrate_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef baudrate
++int    baudrate(void)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_cur_term.c */
++
++#undef _nc_get_cur_term_sp
++TERMINAL *_nc_get_cur_term_sp(
++               SCREEN  *sp)
++               { return(*(TERMINAL **)0); }
++
++#undef _nc_get_cur_term
++TERMINAL *_nc_get_cur_term(void)
++               { return(*(TERMINAL **)0); }
++
++#undef _nc_cur_term
++TERMINAL *_nc_cur_term(void)
++               { return(*(TERMINAL **)0); }
++
++#undef set_curterm_sp
++TERMINAL *set_curterm_sp(
++               SCREEN  *sp, 
++               TERMINAL *termp)
++               { return(*(TERMINAL **)0); }
++
++#undef set_curterm
++TERMINAL *set_curterm(
++               TERMINAL *termp)
++               { return(*(TERMINAL **)0); }
++
++#undef del_curterm_sp
++int    del_curterm_sp(
++               SCREEN  *sp, 
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++#undef del_curterm
++int    del_curterm(
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_data.c */
++
++#undef _nc_stdscr
++WINDOW *_nc_stdscr(void)
++               { return(*(WINDOW **)0); }
++
++#undef _nc_curscr
++WINDOW *_nc_curscr(void)
++               { return(*(WINDOW **)0); }
++
++#undef _nc_newscr
++WINDOW *_nc_newscr(void)
++               { return(*(WINDOW **)0); }
++
++#undef _nc_screen_chain
++SCREEN *_nc_screen_chain;
++#undef SP
++SCREEN *SP;
++#undef _nc_globals
++NCURSES_GLOBALS _nc_globals;
++#undef _nc_prescreen
++NCURSES_PRESCREEN _nc_prescreen;
++
++#undef _nc_screen_of
++SCREEN *_nc_screen_of(
++               WINDOW  *win)
++               { return(*(SCREEN **)0); }
++
++#undef _nc_init_pthreads
++void   _nc_init_pthreads(void)
++               { /* void */ }
++
++#undef _nc_mutex_init
++void   _nc_mutex_init(
++               pthread_mutex_t *obj)
++               { /* void */ }
++
++#undef _nc_mutex_lock
++int    _nc_mutex_lock(
++               pthread_mutex_t *obj)
++               { return(*(int *)0); }
++
++#undef _nc_mutex_trylock
++int    _nc_mutex_trylock(
++               pthread_mutex_t *obj)
++               { return(*(int *)0); }
++
++#undef _nc_mutex_unlock
++int    _nc_mutex_unlock(
++               pthread_mutex_t *obj)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_has_cap.c */
++
++#undef has_ic_sp
++NCURSES_BOOL has_ic_sp(
++               SCREEN  *sp)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_ic
++NCURSES_BOOL has_ic(void)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_il_sp
++NCURSES_BOOL has_il_sp(
++               SCREEN  *sp)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_il
++NCURSES_BOOL has_il(void)
++               { return(*(NCURSES_BOOL *)0); }
++
++/* ./tinfo/lib_kernel.c */
++
++#undef erasechar_sp
++char   erasechar_sp(
++               SCREEN  *sp)
++               { return(*(char *)0); }
++
++#undef erasechar
++char   erasechar(void)
++               { return(*(char *)0); }
++
++#undef killchar_sp
++char   killchar_sp(
++               SCREEN  *sp)
++               { return(*(char *)0); }
++
++#undef killchar
++char   killchar(void)
++               { return(*(char *)0); }
++
++#undef flushinp_sp
++int    flushinp_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef flushinp
++int    flushinp(void)
++               { return(*(int *)0); }
++
++/* ./lib_keyname.c */
++
++struct kn { short offset; int code; };
++
++#undef keyname_sp
++char   *keyname_sp(
++               SCREEN  *sp, 
++               int     c)
++               { return(*(char **)0); }
++
++#undef keyname
++char   *keyname(
++               int     c)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_longname.c */
++
++#undef longname_sp
++char   *longname_sp(
++               SCREEN  *sp)
++               { return(*(char **)0); }
++
++#undef longname
++char   *longname(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_napms.c */
++
++#undef napms_sp
++int    napms_sp(
++               SCREEN  *sp, 
++               int     ms)
++               { return(*(int *)0); }
++
++#undef napms
++int    napms(
++               int     ms)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_options.c */
++
++#undef idlok
++int    idlok(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef idcok
++void   idcok(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { /* void */ }
++
++#undef halfdelay_sp
++int    halfdelay_sp(
++               SCREEN  *sp, 
++               int     t)
++               { return(*(int *)0); }
++
++#undef halfdelay
++int    halfdelay(
++               int     t)
++               { return(*(int *)0); }
++
++#undef nodelay
++int    nodelay(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef notimeout
++int    notimeout(
++               WINDOW  *win, 
++               NCURSES_BOOL f)
++               { return(*(int *)0); }
++
++#undef wtimeout
++void   wtimeout(
++               WINDOW  *win, 
++               int     delay)
++               { /* void */ }
++
++#undef keypad
++int    keypad(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef meta
++int    meta(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef curs_set_sp
++int    curs_set_sp(
++               SCREEN  *sp, 
++               int     vis)
++               { return(*(int *)0); }
++
++#undef curs_set
++int    curs_set(
++               int     vis)
++               { return(*(int *)0); }
++
++#undef typeahead_sp
++int    typeahead_sp(
++               SCREEN  *sp, 
++               int     fd)
++               { return(*(int *)0); }
++
++#undef typeahead
++int    typeahead(
++               int     fd)
++               { return(*(int *)0); }
++
++#undef has_key_sp
++int    has_key_sp(
++               SCREEN  *sp, 
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef has_key
++int    has_key(
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef _nc_putp_flush_sp
++int    _nc_putp_flush_sp(
++               SCREEN  *sp, 
++               const char *name, 
++               const char *value)
++               { return(*(int *)0); }
++
++#undef _nc_keypad
++int    _nc_keypad(
++               SCREEN  *sp, 
++               int     flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_raw.c */
++
++#undef raw_sp
++int    raw_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef raw
++int    raw(void)
++               { return(*(int *)0); }
++
++#undef cbreak_sp
++int    cbreak_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef cbreak
++int    cbreak(void)
++               { return(*(int *)0); }
++
++#undef qiflush_sp
++void   qiflush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef qiflush
++void   qiflush(void)
++               { /* void */ }
++
++#undef noraw_sp
++int    noraw_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef noraw
++int    noraw(void)
++               { return(*(int *)0); }
++
++#undef nocbreak_sp
++int    nocbreak_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef nocbreak
++int    nocbreak(void)
++               { return(*(int *)0); }
++
++#undef noqiflush_sp
++void   noqiflush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef noqiflush
++void   noqiflush(void)
++               { /* void */ }
++
++#undef intrflush_sp
++int    intrflush_sp(
++               SCREEN  *sp, 
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef intrflush
++int    intrflush(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_setup.c */
++
++#include <locale.h>
++#include <sys/ioctl.h>
++#include <langinfo.h>
++
++#undef _nc_ttytype
++char   *_nc_ttytype(void)
++               { return(*(char **)0); }
++
++#undef _nc_ptr_Lines
++int    *_nc_ptr_Lines(
++               SCREEN  *sp)
++               { return(*(int **)0); }
++
++#undef _nc_LINES
++int    _nc_LINES(void)
++               { return(*(int *)0); }
++
++#undef _nc_ptr_Cols
++int    *_nc_ptr_Cols(
++               SCREEN  *sp)
++               { return(*(int **)0); }
++
++#undef _nc_COLS
++int    _nc_COLS(void)
++               { return(*(int *)0); }
++
++#undef _nc_ptr_Tabsize
++int    *_nc_ptr_Tabsize(
++               SCREEN  *sp)
++               { return(*(int **)0); }
++
++#undef _nc_TABSIZE
++int    _nc_TABSIZE(void)
++               { return(*(int *)0); }
++
++#undef set_tabsize_sp
++int    set_tabsize_sp(
++               SCREEN  *sp, 
++               int     value)
++               { return(*(int *)0); }
++
++#undef set_tabsize
++int    set_tabsize(
++               int     value)
++               { return(*(int *)0); }
++
++#undef _nc_handle_sigwinch
++int    _nc_handle_sigwinch(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef use_env_sp
++void   use_env_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_env
++void   use_env(
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl
++void   use_tioctl(
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef _nc_get_screensize
++void   _nc_get_screensize(
++               SCREEN  *sp, 
++               int     *linep, 
++               int     *colp)
++               { /* void */ }
++
++#undef _nc_update_screensize
++void   _nc_update_screensize(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_setup_tinfo
++int    _nc_setup_tinfo(
++               const char *const tn, 
++               TERMTYPE *const tp)
++               { return(*(int *)0); }
++
++#undef _nc_tinfo_cmdch
++void   _nc_tinfo_cmdch(
++               TERMINAL *termp, 
++               int     proto)
++               { /* void */ }
++
++#undef _nc_get_locale
++char   *_nc_get_locale(void)
++               { return(*(char **)0); }
++
++#undef _nc_unicode_locale
++int    _nc_unicode_locale(void)
++               { return(*(int *)0); }
++
++#undef _nc_locale_breaks_acs
++int    _nc_locale_breaks_acs(
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++#undef _nc_setupterm
++int    _nc_setupterm(
++               char    *tname, 
++               int     Filedes, 
++               int     *errret, 
++               int     reuse)
++               { return(*(int *)0); }
++
++#undef new_prescr
++SCREEN *new_prescr(void)
++               { return(*(SCREEN **)0); }
++
++#undef setupterm
++int    setupterm(
++               char    *tname, 
++               int     Filedes, 
++               int     *errret)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_termcap.c */
++
++#undef UP
++char   *UP;
++#undef BC
++char   *BC;
++
++#undef tgetent_sp
++int    tgetent_sp(
++               SCREEN  *sp, 
++               char    *bufp, 
++               const char *name)
++               { return(*(int *)0); }
++
++#if 0
++
++#include <capdefaults.c>
++
++#endif
++
++#undef tgetent
++int    tgetent(
++               char    *bufp, 
++               const char *name)
++               { return(*(int *)0); }
++
++#undef tgetflag_sp
++int    tgetflag_sp(
++               SCREEN  *sp, 
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetflag
++int    tgetflag(
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetnum_sp
++int    tgetnum_sp(
++               SCREEN  *sp, 
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetnum
++int    tgetnum(
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetstr_sp
++char   *tgetstr_sp(
++               SCREEN  *sp, 
++               char    *id, 
++               char    **area)
++               { return(*(char **)0); }
++
++#undef tgetstr
++char   *tgetstr(
++               char    *id, 
++               char    **area)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_termname.c */
++
++#undef termname_sp
++char   *termname_sp(
++               SCREEN  *sp)
++               { return(*(char **)0); }
++
++#undef termname
++char   *termname(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tgoto.c */
++
++#undef tgoto
++char   *tgoto(
++               const char *string, 
++               int     x, 
++               int     y)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_ti.c */
++
++#undef tigetflag_sp
++int    tigetflag_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetflag
++int    tigetflag(
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetnum_sp
++int    tigetnum_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetnum
++int    tigetnum(
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetstr_sp
++char   *tigetstr_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(char **)0); }
++
++#undef tigetstr
++char   *tigetstr(
++               char    *str)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tparm.c */
++
++#undef _nc_tparm_err
++int    _nc_tparm_err;
++
++#undef _nc_tparm_analyze
++int    _nc_tparm_analyze(
++               const char *string, 
++               char    *p_is_s[9], 
++               int     *popcount)
++               { return(*(int *)0); }
++
++#undef tparm
++char   *tparm(
++               char    *string, 
++               ...)
++               { return(*(char **)0); }
++
++#undef tiparm
++char   *tiparm(
++               const char *string, 
++               ...)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tputs.c */
++
++#undef PC
++char   PC;
++#undef ospeed
++short  ospeed;
++#undef _nc_nulls_sent
++int    _nc_nulls_sent;
++
++#undef _nc_set_no_padding
++void   _nc_set_no_padding(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef delay_output_sp
++int    delay_output_sp(
++               SCREEN  *sp, 
++               int     ms)
++               { return(*(int *)0); }
++
++#undef delay_output
++int    delay_output(
++               int     ms)
++               { return(*(int *)0); }
++
++#undef _nc_flush_sp
++void   _nc_flush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_flush
++void   _nc_flush(void)
++               { /* void */ }
++
++#undef _nc_outch_sp
++int    _nc_outch_sp(
++               SCREEN  *sp, 
++               int     ch)
++               { return(*(int *)0); }
++
++#undef _nc_outch
++int    _nc_outch(
++               int     ch)
++               { return(*(int *)0); }
++
++#undef putp_sp
++int    putp_sp(
++               SCREEN  *sp, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef _nc_putp_sp
++int    _nc_putp_sp(
++               SCREEN  *sp, 
++               const char *name, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef putp
++int    putp(
++               const char *string)
++               { return(*(int *)0); }
++
++#undef _nc_putp
++int    _nc_putp(
++               const char *name, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef tputs_sp
++int    tputs_sp(
++               SCREEN  *sp, 
++               const char *string, 
++               int     affcnt, 
++               NCURSES_OUTC_sp outc)
++               { return(*(int *)0); }
++
++#undef _nc_outc_wrapper
++int    _nc_outc_wrapper(
++               SCREEN  *sp, 
++               int     c)
++               { return(*(int *)0); }
++
++#undef tputs
++int    tputs(
++               const char *string, 
++               int     affcnt, 
++               int     (*outc)(
++               int     p1))
++               { return(*(int *)0); }
++
++/* ./trace/lib_trace.c */
++
++#undef _nc_tracing
++unsigned _nc_tracing;
++
++#undef _nc__nc_tputs_trace
++const char *_nc__nc_tputs_trace(void)
++               { return(*(const char **)0); }
++
++#undef _nc__nc_outchars
++long   _nc__nc_outchars(void)
++               { return(*(long *)0); }
++
++#undef _nc_set_tputs_trace
++void   _nc_set_tputs_trace(
++               const char *s)
++               { /* void */ }
++
++#undef _nc_count_outchars
++void   _nc_count_outchars(
++               long    increment)
++               { /* void */ }
++
++#undef trace
++void   trace(
++               const unsigned int tracelevel)
++               { /* void */ }
++
++#undef _tracef
++void   _tracef(
++               const char *fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_retrace_bool
++NCURSES_BOOL _nc_retrace_bool(
++               int     code)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_retrace_char
++char   _nc_retrace_char(
++               int     code)
++               { return(*(char *)0); }
++
++#undef _nc_retrace_int
++int    _nc_retrace_int(
++               int     code)
++               { return(*(int *)0); }
++
++#undef _nc_retrace_unsigned
++unsigned _nc_retrace_unsigned(
++               unsigned code)
++               { return(*(unsigned *)0); }
++
++#undef _nc_retrace_ptr
++char   *_nc_retrace_ptr(
++               char    *code)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_cptr
++const char *_nc_retrace_cptr(
++               const char *code)
++               { return(*(const char **)0); }
++
++#undef _nc_retrace_cvoid_ptr
++void   *_nc_retrace_cvoid_ptr(
++               void    *code)
++               { return(*(void **)0); }
++
++#undef _nc_retrace_void_ptr
++void   *_nc_retrace_void_ptr(
++               void    *code)
++               { return(*(void **)0); }
++
++#undef _nc_retrace_sp
++SCREEN *_nc_retrace_sp(
++               SCREEN  *code)
++               { return(*(SCREEN **)0); }
++
++#undef _nc_retrace_win
++WINDOW *_nc_retrace_win(
++               WINDOW  *code)
++               { return(*(WINDOW **)0); }
++
++#undef _nc_use_tracef
++int    _nc_use_tracef(
++               unsigned mask)
++               { return(*(int *)0); }
++
++#undef _nc_locked_tracef
++void   _nc_locked_tracef(
++               const char *fmt, 
++               ...)
++               { /* void */ }
++
++/* ./trace/lib_traceatr.c */
++
++#undef _traceattr2
++char   *_traceattr2(
++               int     bufnum, 
++               chtype  newmode)
++               { return(*(char **)0); }
++
++#undef _traceattr
++char   *_traceattr(
++               attr_t  newmode)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_int_attr_t
++int    _nc_retrace_int_attr_t(
++               attr_t  code)
++               { return(*(int *)0); }
++
++#undef _nc_retrace_attr_t
++attr_t _nc_retrace_attr_t(
++               attr_t  code)
++               { return(*(attr_t *)0); }
++
++#undef _nc_altcharset_name
++const char *_nc_altcharset_name(
++               attr_t  attr, 
++               chtype  ch)
++               { return(*(const char **)0); }
++
++#undef _tracechtype2
++char   *_tracechtype2(
++               int     bufnum, 
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef _tracechtype
++char   *_tracechtype(
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_chtype
++chtype _nc_retrace_chtype(
++               chtype  code)
++               { return(*(chtype *)0); }
++
++#undef _tracecchar_t2
++char   *_tracecchar_t2(
++               int     bufnum, 
++               const cchar_t *ch)
++               { return(*(char **)0); }
++
++#undef _tracecchar_t
++char   *_tracecchar_t(
++               const cchar_t *ch)
++               { return(*(char **)0); }
++
++/* ./trace/lib_tracebits.c */
++
++typedef struct {
++    unsigned int val;
++    const char *name;
++} BITNAMES;
++
++#undef _nc_trace_ttymode
++char   *_nc_trace_ttymode(
++               struct termios *tty)
++               { return(*(char **)0); }
++
++#undef _nc_tracebits
++char   *_nc_tracebits(void)
++               { return(*(char **)0); }
++
++/* ./trace/lib_tracechr.c */
++
++#undef _nc_tracechar
++char   *_nc_tracechar(
++               SCREEN  *sp, 
++               int     ch)
++               { return(*(char **)0); }
++
++#undef _tracechar
++char   *_tracechar(
++               int     ch)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_ttyflags.c */
++
++#undef _nc_get_tty_mode_sp
++int    _nc_get_tty_mode_sp(
++               SCREEN  *sp, 
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_get_tty_mode
++int    _nc_get_tty_mode(
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_set_tty_mode_sp
++int    _nc_set_tty_mode_sp(
++               SCREEN  *sp, 
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_set_tty_mode
++int    _nc_set_tty_mode(
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef def_shell_mode_sp
++int    def_shell_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef def_shell_mode
++int    def_shell_mode(void)
++               { return(*(int *)0); }
++
++#undef def_prog_mode_sp
++int    def_prog_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef def_prog_mode
++int    def_prog_mode(void)
++               { return(*(int *)0); }
++
++#undef reset_prog_mode_sp
++int    reset_prog_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef reset_prog_mode
++int    reset_prog_mode(void)
++               { return(*(int *)0); }
++
++#undef reset_shell_mode_sp
++int    reset_shell_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef reset_shell_mode
++int    reset_shell_mode(void)
++               { return(*(int *)0); }
++
++#undef savetty_sp
++int    savetty_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef savetty
++int    savetty(void)
++               { return(*(int *)0); }
++
++#undef resetty_sp
++int    resetty_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef resetty
++int    resetty(void)
++               { return(*(int *)0); }
++
++/* ./tty/lib_twait.c */
++
++#include <sys/time.h>
++
++#undef _nc_timed_wait
++int    _nc_timed_wait(
++               SCREEN  *sp, 
++               int     mode, 
++               int     milliseconds, 
++               int     *timeleft)
++               { return(*(int *)0); }
++
++/* ./tinfo/name_match.c */
++
++#undef _nc_first_name
++char   *_nc_first_name(
++               const char *const sp)
++               { return(*(char **)0); }
++
++#undef _nc_name_match
++int    _nc_name_match(
++               const char *const namelst, 
++               const char *const name, 
++               const char *const delim)
++               { return(*(int *)0); }
++
++/* ./names.c */
++
++#undef _nc_boolnames
++char   *const *_nc_boolnames(void)
++               { return(*(char **)0); }
++
++#undef _nc_boolfnames
++char   *const *_nc_boolfnames(void)
++               { return(*(char **)0); }
++
++#undef _nc_numnames
++char   *const *_nc_numnames(void)
++               { return(*(char **)0); }
++
++#undef _nc_numfnames
++char   *const *_nc_numfnames(void)
++               { return(*(char **)0); }
++
++#undef _nc_strnames
++char   *const *_nc_strnames(void)
++               { return(*(char **)0); }
++
++#undef _nc_strfnames
++char   *const *_nc_strfnames(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/read_entry.c */
++
++#include <hashed_db.h>
++
++#undef _nc_read_termtype
++int    _nc_read_termtype(
++               TERMTYPE *ptr, 
++               char    *buffer, 
++               int     limit)
++               { return(*(int *)0); }
++
++#undef _nc_read_file_entry
++int    _nc_read_file_entry(
++               const char *const filename, 
++               TERMTYPE *ptr)
++               { return(*(int *)0); }
++
++#undef _nc_read_entry
++int    _nc_read_entry(
++               const char *const name, 
++               char    *const filename, 
++               TERMTYPE *const tp)
++               { return(*(int *)0); }
++
++/* ./tinfo/read_termcap.c */
++
++#include <sys/types.h>
++
++#undef _nc_read_termcap
++void   _nc_read_termcap(void)
++               { /* void */ }
++
++/* ./tinfo/setbuf.c */
++
++#undef _nc_set_buffer_sp
++void   _nc_set_buffer_sp(
++               SCREEN  *sp, 
++               FILE    *ofp, 
++               int     buffered)
++               { /* void */ }
++
++#undef _nc_set_buffer
++void   _nc_set_buffer(
++               FILE    *ofp, 
++               int     buffered)
++               { /* void */ }
++
++/* ./tinfo/strings.c */
++
++#undef _nc_str_init
++string_desc *_nc_str_init(
++               string_desc *dst, 
++               char    *src, 
++               size_t  len)
++               { return(*(string_desc **)0); }
++
++#undef _nc_str_null
++string_desc *_nc_str_null(
++               string_desc *dst, 
++               size_t  len)
++               { return(*(string_desc **)0); }
++
++#undef _nc_str_copy
++string_desc *_nc_str_copy(
++               string_desc *dst, 
++               string_desc *src)
++               { return(*(string_desc **)0); }
++
++#undef _nc_safe_strcat
++NCURSES_BOOL _nc_safe_strcat(
++               string_desc *dst, 
++               const char *src)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_safe_strcpy
++NCURSES_BOOL _nc_safe_strcpy(
++               string_desc *dst, 
++               const char *src)
++               { return(*(NCURSES_BOOL *)0); }
++
++/* ./trace/trace_buf.c */
++
++#undef _nc_trace_buf
++char   *_nc_trace_buf(
++               int     bufnum, 
++               size_t  want)
++               { return(*(char **)0); }
++
++#undef _nc_trace_bufcat
++char   *_nc_trace_bufcat(
++               int     bufnum, 
++               const char *value)
++               { return(*(char **)0); }
++
++/* ./trace/trace_tries.c */
++
++#undef _nc_trace_tries
++void   _nc_trace_tries(
++               TRIES   *tree)
++               { /* void */ }
++
++/* ./base/tries.c */
++
++#undef _nc_expand_try
++char   *_nc_expand_try(
++               TRIES   *tree, 
++               unsigned code, 
++               int     *count, 
++               size_t  len)
++               { return(*(char **)0); }
++
++#undef _nc_remove_key
++int    _nc_remove_key(
++               TRIES   **tree, 
++               unsigned code)
++               { return(*(int *)0); }
++
++#undef _nc_remove_string
++int    _nc_remove_string(
++               TRIES   **tree, 
++               const char *string)
++               { return(*(int *)0); }
++
++/* ./tinfo/trim_sgr0.c */
++
++#undef _nc_trim_sgr0
++char   *_nc_trim_sgr0(
++               TERMTYPE *tp)
++               { return(*(char **)0); }
++
++/* ./unctrl.c */
++
++#undef unctrl_sp
++char   *unctrl_sp(
++               SCREEN  *sp, 
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef unctrl
++char   *unctrl(
++               chtype  ch)
++               { return(*(char **)0); }
++
++/* ./trace/visbuf.c */
++
++#undef _nc_visbuf2
++const char *_nc_visbuf2(
++               int     bufnum, 
++               const char *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_visbuf
++const char *_nc_visbuf(
++               const char *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_visbufn
++const char *_nc_visbufn(
++               const char *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viswbuf2
++const char *_nc_viswbuf2(
++               int     bufnum, 
++               const wchar_t *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_viswbuf
++const char *_nc_viswbuf(
++               const wchar_t *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_viswbufn
++const char *_nc_viswbufn(
++               const wchar_t *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viswibuf
++const char *_nc_viswibuf(
++               const wint_t *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_viscbuf2
++const char *_nc_viscbuf2(
++               int     bufnum, 
++               const cchar_t *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viscbuf
++const char *_nc_viscbuf(
++               const cchar_t *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++/* ./base/define_key.c */
++
++#undef define_key_sp
++int    define_key_sp(
++               SCREEN  *sp, 
++               const char *str, 
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef define_key
++int    define_key(
++               const char *str, 
++               int     keycode)
++               { return(*(int *)0); }
++
++/* ./tinfo/hashed_db.c */
++
++#undef _nc_hashed_db
++void   _nc_hashed_db(void)
++               { /* void */ }
++
++/* ./base/key_defined.c */
++
++#undef key_defined_sp
++int    key_defined_sp(
++               SCREEN  *sp, 
++               const char *str)
++               { return(*(int *)0); }
++
++#undef key_defined
++int    key_defined(
++               const char *str)
++               { return(*(int *)0); }
++
++/* ./base/keybound.c */
++
++#undef keybound_sp
++char   *keybound_sp(
++               SCREEN  *sp, 
++               int     code, 
++               int     count)
++               { return(*(char **)0); }
++
++#undef keybound
++char   *keybound(
++               int     code, 
++               int     count)
++               { return(*(char **)0); }
++
++/* ./base/keyok.c */
++
++#undef keyok_sp
++int    keyok_sp(
++               SCREEN  *sp, 
++               int     c, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef keyok
++int    keyok(
++               int     c, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./base/version.c */
++
++#undef curses_version
++const char *curses_version(void)
++               { return(*(const char **)0); }
+diff -Naur ncurses-5.9.orig/ncurses/llib-ltinfow ncurses-5.9/ncurses/llib-ltinfow
+--- ncurses-5.9.orig/ncurses/llib-ltinfow       1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/ncurses/llib-ltinfow    2012-08-25 19:58:01.999888649 +0000
+@@ -0,0 +1,1537 @@
++/****************************************************************************
++ * Copyright (c) 2012 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey 2012                                           *
++ ****************************************************************************/
++/* LINTLIBRARY */
++
++/* ./tinfo/access.c */
++
++#include <curses.priv.h>
++#include <ctype.h>
++#include <tic.h>
++
++#undef _nc_rootname
++char   *_nc_rootname(
++               char    *path)
++               { return(*(char **)0); }
++
++#undef _nc_is_abs_path
++NCURSES_BOOL _nc_is_abs_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_pathlast
++unsigned _nc_pathlast(
++               const char *path)
++               { return(*(unsigned *)0); }
++
++#undef _nc_basename
++char   *_nc_basename(
++               char    *path)
++               { return(*(char **)0); }
++
++#undef _nc_access
++int    _nc_access(
++               const char *path, 
++               int     mode)
++               { return(*(int *)0); }
++
++#undef _nc_is_dir_path
++NCURSES_BOOL _nc_is_dir_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_is_file_path
++NCURSES_BOOL _nc_is_file_path(
++               const char *path)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_env_access
++int    _nc_env_access(void)
++               { return(*(int *)0); }
++
++/* ./tinfo/add_tries.c */
++
++#undef _nc_add_to_try
++int    _nc_add_to_try(
++               TRIES   **tree, 
++               const char *str, 
++               unsigned code)
++               { return(*(int *)0); }
++
++/* ./tinfo/alloc_ttype.c */
++
++#undef _nc_align_termtype
++void   _nc_align_termtype(
++               TERMTYPE *to, 
++               TERMTYPE *from)
++               { /* void */ }
++
++#undef _nc_copy_termtype
++void   _nc_copy_termtype(
++               TERMTYPE *dst, 
++               const TERMTYPE *src)
++               { /* void */ }
++
++/* ./codes.c */
++
++#undef boolcodes
++char   *const boolcodes[] = {0};
++#undef numcodes
++char   *const numcodes[] = {0};
++#undef strcodes
++char   *const strcodes[] = {0};
++
++/* ./comp_captab.c */
++
++#include <hashsize.h>
++
++#undef _nc_get_table
++const struct name_table_entry *_nc_get_table(
++               NCURSES_BOOL termcap)
++               { return(*(const struct name_table_entry **)0); }
++
++#undef _nc_get_hash_table
++const HashValue *_nc_get_hash_table(
++               NCURSES_BOOL termcap)
++               { return(*(const HashValue **)0); }
++
++#undef _nc_get_alias_table
++const struct alias *_nc_get_alias_table(
++               NCURSES_BOOL termcap)
++               { return(*(const struct alias **)0); }
++
++#undef _nc_get_hash_info
++const HashData *_nc_get_hash_info(
++               NCURSES_BOOL termcap)
++               { return(*(const HashData **)0); }
++
++/* ./tinfo/comp_error.c */
++
++#undef _nc_suppress_warnings
++NCURSES_BOOL _nc_suppress_warnings;
++#undef _nc_curr_line
++int    _nc_curr_line;
++#undef _nc_curr_col
++int    _nc_curr_col;
++
++#undef _nc_get_source
++const char *_nc_get_source(void)
++               { return(*(const char **)0); }
++
++#undef _nc_set_source
++void   _nc_set_source(
++               const char *const name)
++               { /* void */ }
++
++#undef _nc_set_type
++void   _nc_set_type(
++               const char *const name)
++               { /* void */ }
++
++#undef _nc_get_type
++void   _nc_get_type(
++               char    *name)
++               { /* void */ }
++
++#undef _nc_warning
++void   _nc_warning(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_err_abort
++void   _nc_err_abort(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_syserr_abort
++void   _nc_syserr_abort(
++               const char *const fmt, 
++               ...)
++               { /* void */ }
++
++/* ./tinfo/comp_hash.c */
++
++#undef _nc_find_entry
++struct name_table_entry const *_nc_find_entry(
++               const char *string, 
++               const HashValue *hash_table)
++               { return(*(struct name_table_entry const **)0); }
++
++#undef _nc_find_type_entry
++struct name_table_entry const *_nc_find_type_entry(
++               const char *string, 
++               int     type, 
++               NCURSES_BOOL termcap)
++               { return(*(struct name_table_entry const **)0); }
++
++/* ./tinfo/db_iterator.c */
++
++#include <time.h>
++
++#undef _nc_tic_dir
++const char *_nc_tic_dir(
++               const char *path)
++               { return(*(const char **)0); }
++
++#undef _nc_keep_tic_dir
++void   _nc_keep_tic_dir(
++               const char *path)
++               { /* void */ }
++
++#undef _nc_last_db
++void   _nc_last_db(void)
++               { /* void */ }
++
++#undef _nc_next_db
++const char *_nc_next_db(
++               DBDIRS  *state, 
++               int     *offset)
++               { return(*(const char **)0); }
++
++#undef _nc_first_db
++void   _nc_first_db(
++               DBDIRS  *state, 
++               int     *offset)
++               { /* void */ }
++
++/* ./tinfo/doalloc.c */
++
++#undef _nc_doalloc
++void   *_nc_doalloc(
++               void    *oldp, 
++               size_t  amount)
++               { return(*(void **)0); }
++
++/* ./tinfo/entries.c */
++
++#undef _nc_head
++ENTRY  *_nc_head;
++#undef _nc_tail
++ENTRY  *_nc_tail;
++
++#undef _nc_free_entry
++void   _nc_free_entry(
++               ENTRY   *headp, 
++               TERMTYPE *tterm)
++               { /* void */ }
++
++#undef _nc_free_entries
++void   _nc_free_entries(
++               ENTRY   *headp)
++               { /* void */ }
++
++#undef _nc_delink_entry
++ENTRY  *_nc_delink_entry(
++               ENTRY   *headp, 
++               TERMTYPE *tterm)
++               { return(*(ENTRY **)0); }
++
++#undef _nc_leaks_tinfo
++void   _nc_leaks_tinfo(void)
++               { /* void */ }
++
++/* ./fallback.c */
++
++#undef _nc_fallback
++const TERMTYPE *_nc_fallback(
++               const char *name)
++               { return(*(const TERMTYPE **)0); }
++
++/* ./tinfo/free_ttype.c */
++
++#undef _nc_free_termtype
++void   _nc_free_termtype(
++               TERMTYPE *ptr)
++               { /* void */ }
++
++#undef _nc_user_definable
++NCURSES_BOOL _nc_user_definable;
++
++#undef use_extended_names
++int    use_extended_names(
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/getenv_num.c */
++
++#undef _nc_getenv_num
++int    _nc_getenv_num(
++               const char *name)
++               { return(*(int *)0); }
++
++/* ./tinfo/home_terminfo.c */
++
++#undef _nc_home_terminfo
++char   *_nc_home_terminfo(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/init_keytry.c */
++
++#if 0
++
++#include <init_keytry.h>
++
++#undef _nc_tinfo_fkeys
++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
++
++#endif
++
++#undef _nc_init_keytry
++void   _nc_init_keytry(
++               SCREEN  *sp)
++               { /* void */ }
++
++/* ./tinfo/lib_acs.c */
++
++#undef acs_map
++chtype acs_map[128];
++
++#undef _nc_init_acs_sp
++void   _nc_init_acs_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_init_acs
++void   _nc_init_acs(void)
++               { /* void */ }
++
++/* ./tinfo/lib_baudrate.c */
++
++#include <termcap.h>
++
++struct speed {
++    int s; 
++    int sp; 
++};
++
++#undef _nc_baudrate
++int    _nc_baudrate(
++               int     OSpeed)
++               { return(*(int *)0); }
++
++#undef _nc_ospeed
++int    _nc_ospeed(
++               int     BaudRate)
++               { return(*(int *)0); }
++
++#undef baudrate_sp
++int    baudrate_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef baudrate
++int    baudrate(void)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_cur_term.c */
++
++#undef cur_term
++TERMINAL *cur_term;
++
++#undef set_curterm_sp
++TERMINAL *set_curterm_sp(
++               SCREEN  *sp, 
++               TERMINAL *termp)
++               { return(*(TERMINAL **)0); }
++
++#undef set_curterm
++TERMINAL *set_curterm(
++               TERMINAL *termp)
++               { return(*(TERMINAL **)0); }
++
++#undef del_curterm_sp
++int    del_curterm_sp(
++               SCREEN  *sp, 
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++#undef del_curterm
++int    del_curterm(
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_data.c */
++
++#undef stdscr
++WINDOW *stdscr;
++#undef curscr
++WINDOW *curscr;
++#undef newscr
++WINDOW *newscr;
++#undef _nc_screen_chain
++SCREEN *_nc_screen_chain;
++#undef SP
++SCREEN *SP;
++#undef _nc_globals
++NCURSES_GLOBALS _nc_globals;
++#undef _nc_prescreen
++NCURSES_PRESCREEN _nc_prescreen;
++
++#undef _nc_screen_of
++SCREEN *_nc_screen_of(
++               WINDOW  *win)
++               { return(*(SCREEN **)0); }
++
++/* ./tinfo/lib_has_cap.c */
++
++#undef has_ic_sp
++NCURSES_BOOL has_ic_sp(
++               SCREEN  *sp)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_ic
++NCURSES_BOOL has_ic(void)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_il_sp
++NCURSES_BOOL has_il_sp(
++               SCREEN  *sp)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef has_il
++NCURSES_BOOL has_il(void)
++               { return(*(NCURSES_BOOL *)0); }
++
++/* ./tinfo/lib_kernel.c */
++
++#undef erasechar_sp
++char   erasechar_sp(
++               SCREEN  *sp)
++               { return(*(char *)0); }
++
++#undef erasechar
++char   erasechar(void)
++               { return(*(char *)0); }
++
++#undef killchar_sp
++char   killchar_sp(
++               SCREEN  *sp)
++               { return(*(char *)0); }
++
++#undef killchar
++char   killchar(void)
++               { return(*(char *)0); }
++
++#undef flushinp_sp
++int    flushinp_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef flushinp
++int    flushinp(void)
++               { return(*(int *)0); }
++
++/* ./lib_keyname.c */
++
++struct kn { short offset; int code; };
++
++#undef keyname_sp
++char   *keyname_sp(
++               SCREEN  *sp, 
++               int     c)
++               { return(*(char **)0); }
++
++#undef keyname
++char   *keyname(
++               int     c)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_longname.c */
++
++#undef longname
++char   *longname(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_napms.c */
++
++#include <sys/time.h>
++
++#undef napms_sp
++int    napms_sp(
++               SCREEN  *sp, 
++               int     ms)
++               { return(*(int *)0); }
++
++#undef napms
++int    napms(
++               int     ms)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_options.c */
++
++#undef idlok
++int    idlok(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef idcok
++void   idcok(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { /* void */ }
++
++#undef halfdelay_sp
++int    halfdelay_sp(
++               SCREEN  *sp, 
++               int     t)
++               { return(*(int *)0); }
++
++#undef halfdelay
++int    halfdelay(
++               int     t)
++               { return(*(int *)0); }
++
++#undef nodelay
++int    nodelay(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef notimeout
++int    notimeout(
++               WINDOW  *win, 
++               NCURSES_BOOL f)
++               { return(*(int *)0); }
++
++#undef wtimeout
++void   wtimeout(
++               WINDOW  *win, 
++               int     delay)
++               { /* void */ }
++
++#undef keypad
++int    keypad(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef meta
++int    meta(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef curs_set_sp
++int    curs_set_sp(
++               SCREEN  *sp, 
++               int     vis)
++               { return(*(int *)0); }
++
++#undef curs_set
++int    curs_set(
++               int     vis)
++               { return(*(int *)0); }
++
++#undef typeahead_sp
++int    typeahead_sp(
++               SCREEN  *sp, 
++               int     fd)
++               { return(*(int *)0); }
++
++#undef typeahead
++int    typeahead(
++               int     fd)
++               { return(*(int *)0); }
++
++#undef has_key_sp
++int    has_key_sp(
++               SCREEN  *sp, 
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef has_key
++int    has_key(
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef _nc_putp_flush_sp
++int    _nc_putp_flush_sp(
++               SCREEN  *sp, 
++               const char *name, 
++               const char *value)
++               { return(*(int *)0); }
++
++#undef _nc_keypad
++int    _nc_keypad(
++               SCREEN  *sp, 
++               int     flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_raw.c */
++
++#undef raw_sp
++int    raw_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef raw
++int    raw(void)
++               { return(*(int *)0); }
++
++#undef cbreak_sp
++int    cbreak_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef cbreak
++int    cbreak(void)
++               { return(*(int *)0); }
++
++#undef qiflush_sp
++void   qiflush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef qiflush
++void   qiflush(void)
++               { /* void */ }
++
++#undef noraw_sp
++int    noraw_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef noraw
++int    noraw(void)
++               { return(*(int *)0); }
++
++#undef nocbreak_sp
++int    nocbreak_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef nocbreak
++int    nocbreak(void)
++               { return(*(int *)0); }
++
++#undef noqiflush_sp
++void   noqiflush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef noqiflush
++void   noqiflush(void)
++               { /* void */ }
++
++#undef intrflush_sp
++int    intrflush_sp(
++               SCREEN  *sp, 
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef intrflush
++int    intrflush(
++               WINDOW  *win, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_setup.c */
++
++#include <locale.h>
++#include <sys/ioctl.h>
++#include <langinfo.h>
++
++#undef ttytype
++char   ttytype[256];
++#undef LINES
++int    LINES;
++#undef COLS
++int    COLS;
++#undef TABSIZE
++int    TABSIZE;
++
++#undef set_tabsize_sp
++int    set_tabsize_sp(
++               SCREEN  *sp, 
++               int     value)
++               { return(*(int *)0); }
++
++#undef set_tabsize
++int    set_tabsize(
++               int     value)
++               { return(*(int *)0); }
++
++#undef _nc_handle_sigwinch
++int    _nc_handle_sigwinch(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef use_env_sp
++void   use_env_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_env
++void   use_env(
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl_sp
++void   use_tioctl_sp(
++               SCREEN  *sp, 
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef use_tioctl
++void   use_tioctl(
++               NCURSES_BOOL f)
++               { /* void */ }
++
++#undef _nc_get_screensize
++void   _nc_get_screensize(
++               SCREEN  *sp, 
++               int     *linep, 
++               int     *colp)
++               { /* void */ }
++
++#undef _nc_update_screensize
++void   _nc_update_screensize(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_setup_tinfo
++int    _nc_setup_tinfo(
++               const char *const tn, 
++               TERMTYPE *const tp)
++               { return(*(int *)0); }
++
++#undef _nc_tinfo_cmdch
++void   _nc_tinfo_cmdch(
++               TERMINAL *termp, 
++               int     proto)
++               { /* void */ }
++
++#undef _nc_get_locale
++char   *_nc_get_locale(void)
++               { return(*(char **)0); }
++
++#undef _nc_unicode_locale
++int    _nc_unicode_locale(void)
++               { return(*(int *)0); }
++
++#undef _nc_locale_breaks_acs
++int    _nc_locale_breaks_acs(
++               TERMINAL *termp)
++               { return(*(int *)0); }
++
++#undef _nc_setupterm
++int    _nc_setupterm(
++               char    *tname, 
++               int     Filedes, 
++               int     *errret, 
++               int     reuse)
++               { return(*(int *)0); }
++
++#undef new_prescr
++SCREEN *new_prescr(void)
++               { return(*(SCREEN **)0); }
++
++#undef setupterm
++int    setupterm(
++               char    *tname, 
++               int     Filedes, 
++               int     *errret)
++               { return(*(int *)0); }
++
++/* ./tinfo/lib_termcap.c */
++
++#undef UP
++char   *UP;
++#undef BC
++char   *BC;
++
++#undef tgetent_sp
++int    tgetent_sp(
++               SCREEN  *sp, 
++               char    *bufp, 
++               const char *name)
++               { return(*(int *)0); }
++
++#if 0
++
++#include <capdefaults.c>
++
++#endif
++
++#undef tgetent
++int    tgetent(
++               char    *bufp, 
++               const char *name)
++               { return(*(int *)0); }
++
++#undef tgetflag_sp
++int    tgetflag_sp(
++               SCREEN  *sp, 
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetflag
++int    tgetflag(
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetnum_sp
++int    tgetnum_sp(
++               SCREEN  *sp, 
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetnum
++int    tgetnum(
++               char    *id)
++               { return(*(int *)0); }
++
++#undef tgetstr_sp
++char   *tgetstr_sp(
++               SCREEN  *sp, 
++               char    *id, 
++               char    **area)
++               { return(*(char **)0); }
++
++#undef tgetstr
++char   *tgetstr(
++               char    *id, 
++               char    **area)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_termname.c */
++
++#undef termname_sp
++char   *termname_sp(
++               SCREEN  *sp)
++               { return(*(char **)0); }
++
++#undef termname
++char   *termname(void)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tgoto.c */
++
++#undef tgoto
++char   *tgoto(
++               const char *string, 
++               int     x, 
++               int     y)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_ti.c */
++
++#undef tigetflag_sp
++int    tigetflag_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetflag
++int    tigetflag(
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetnum_sp
++int    tigetnum_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetnum
++int    tigetnum(
++               char    *str)
++               { return(*(int *)0); }
++
++#undef tigetstr_sp
++char   *tigetstr_sp(
++               SCREEN  *sp, 
++               char    *str)
++               { return(*(char **)0); }
++
++#undef tigetstr
++char   *tigetstr(
++               char    *str)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tparm.c */
++
++#undef _nc_tparm_err
++int    _nc_tparm_err;
++
++#undef _nc_tparm_analyze
++int    _nc_tparm_analyze(
++               const char *string, 
++               char    *p_is_s[9], 
++               int     *popcount)
++               { return(*(int *)0); }
++
++#undef tparm
++char   *tparm(
++               char    *string, 
++               ...)
++               { return(*(char **)0); }
++
++#undef tiparm
++char   *tiparm(
++               const char *string, 
++               ...)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_tputs.c */
++
++#undef PC
++char   PC;
++#undef ospeed
++short  ospeed;
++#undef _nc_nulls_sent
++int    _nc_nulls_sent;
++
++#undef _nc_set_no_padding
++void   _nc_set_no_padding(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef delay_output_sp
++int    delay_output_sp(
++               SCREEN  *sp, 
++               int     ms)
++               { return(*(int *)0); }
++
++#undef delay_output
++int    delay_output(
++               int     ms)
++               { return(*(int *)0); }
++
++#undef _nc_flush_sp
++void   _nc_flush_sp(
++               SCREEN  *sp)
++               { /* void */ }
++
++#undef _nc_flush
++void   _nc_flush(void)
++               { /* void */ }
++
++#undef _nc_outch_sp
++int    _nc_outch_sp(
++               SCREEN  *sp, 
++               int     ch)
++               { return(*(int *)0); }
++
++#undef _nc_outch
++int    _nc_outch(
++               int     ch)
++               { return(*(int *)0); }
++
++#undef putp_sp
++int    putp_sp(
++               SCREEN  *sp, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef _nc_putp_sp
++int    _nc_putp_sp(
++               SCREEN  *sp, 
++               const char *name, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef putp
++int    putp(
++               const char *string)
++               { return(*(int *)0); }
++
++#undef _nc_putp
++int    _nc_putp(
++               const char *name, 
++               const char *string)
++               { return(*(int *)0); }
++
++#undef tputs_sp
++int    tputs_sp(
++               SCREEN  *sp, 
++               const char *string, 
++               int     affcnt, 
++               NCURSES_OUTC_sp outc)
++               { return(*(int *)0); }
++
++#undef _nc_outc_wrapper
++int    _nc_outc_wrapper(
++               SCREEN  *sp, 
++               int     c)
++               { return(*(int *)0); }
++
++#undef tputs
++int    tputs(
++               const char *string, 
++               int     affcnt, 
++               int     (*outc)(
++               int     p1))
++               { return(*(int *)0); }
++
++/* ./trace/lib_trace.c */
++
++#undef _nc_tracing
++unsigned _nc_tracing;
++#undef _nc_tputs_trace
++const char *_nc_tputs_trace = {0};
++#undef _nc_outchars
++long   _nc_outchars;
++
++#undef trace
++void   trace(
++               const unsigned int tracelevel)
++               { /* void */ }
++
++#undef _tracef
++void   _tracef(
++               const char *fmt, 
++               ...)
++               { /* void */ }
++
++#undef _nc_retrace_bool
++NCURSES_BOOL _nc_retrace_bool(
++               int     code)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_retrace_char
++char   _nc_retrace_char(
++               int     code)
++               { return(*(char *)0); }
++
++#undef _nc_retrace_int
++int    _nc_retrace_int(
++               int     code)
++               { return(*(int *)0); }
++
++#undef _nc_retrace_unsigned
++unsigned _nc_retrace_unsigned(
++               unsigned code)
++               { return(*(unsigned *)0); }
++
++#undef _nc_retrace_ptr
++char   *_nc_retrace_ptr(
++               char    *code)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_cptr
++const char *_nc_retrace_cptr(
++               const char *code)
++               { return(*(const char **)0); }
++
++#undef _nc_retrace_cvoid_ptr
++void   *_nc_retrace_cvoid_ptr(
++               void    *code)
++               { return(*(void **)0); }
++
++#undef _nc_retrace_void_ptr
++void   *_nc_retrace_void_ptr(
++               void    *code)
++               { return(*(void **)0); }
++
++#undef _nc_retrace_sp
++SCREEN *_nc_retrace_sp(
++               SCREEN  *code)
++               { return(*(SCREEN **)0); }
++
++#undef _nc_retrace_win
++WINDOW *_nc_retrace_win(
++               WINDOW  *code)
++               { return(*(WINDOW **)0); }
++
++/* ./trace/lib_traceatr.c */
++
++#undef _traceattr2
++char   *_traceattr2(
++               int     bufnum, 
++               chtype  newmode)
++               { return(*(char **)0); }
++
++#undef _traceattr
++char   *_traceattr(
++               attr_t  newmode)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_int_attr_t
++int    _nc_retrace_int_attr_t(
++               attr_t  code)
++               { return(*(int *)0); }
++
++#undef _nc_retrace_attr_t
++attr_t _nc_retrace_attr_t(
++               attr_t  code)
++               { return(*(attr_t *)0); }
++
++#undef _nc_altcharset_name
++const char *_nc_altcharset_name(
++               attr_t  attr, 
++               chtype  ch)
++               { return(*(const char **)0); }
++
++#undef _tracechtype2
++char   *_tracechtype2(
++               int     bufnum, 
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef _tracechtype
++char   *_tracechtype(
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef _nc_retrace_chtype
++chtype _nc_retrace_chtype(
++               chtype  code)
++               { return(*(chtype *)0); }
++
++#undef _tracecchar_t2
++char   *_tracecchar_t2(
++               int     bufnum, 
++               const cchar_t *ch)
++               { return(*(char **)0); }
++
++#undef _tracecchar_t
++char   *_tracecchar_t(
++               const cchar_t *ch)
++               { return(*(char **)0); }
++
++/* ./trace/lib_tracebits.c */
++
++typedef struct {
++    unsigned int val;
++    const char *name;
++} BITNAMES;
++
++#undef _nc_trace_ttymode
++char   *_nc_trace_ttymode(
++               struct termios *tty)
++               { return(*(char **)0); }
++
++#undef _nc_tracebits
++char   *_nc_tracebits(void)
++               { return(*(char **)0); }
++
++/* ./trace/lib_tracechr.c */
++
++#undef _nc_tracechar
++char   *_nc_tracechar(
++               SCREEN  *sp, 
++               int     ch)
++               { return(*(char **)0); }
++
++#undef _tracechar
++char   *_tracechar(
++               int     ch)
++               { return(*(char **)0); }
++
++/* ./tinfo/lib_ttyflags.c */
++
++#undef _nc_get_tty_mode_sp
++int    _nc_get_tty_mode_sp(
++               SCREEN  *sp, 
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_get_tty_mode
++int    _nc_get_tty_mode(
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_set_tty_mode_sp
++int    _nc_set_tty_mode_sp(
++               SCREEN  *sp, 
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef _nc_set_tty_mode
++int    _nc_set_tty_mode(
++               struct termios *buf)
++               { return(*(int *)0); }
++
++#undef def_shell_mode_sp
++int    def_shell_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef def_shell_mode
++int    def_shell_mode(void)
++               { return(*(int *)0); }
++
++#undef def_prog_mode_sp
++int    def_prog_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef def_prog_mode
++int    def_prog_mode(void)
++               { return(*(int *)0); }
++
++#undef reset_prog_mode_sp
++int    reset_prog_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef reset_prog_mode
++int    reset_prog_mode(void)
++               { return(*(int *)0); }
++
++#undef reset_shell_mode_sp
++int    reset_shell_mode_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef reset_shell_mode
++int    reset_shell_mode(void)
++               { return(*(int *)0); }
++
++#undef savetty_sp
++int    savetty_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef savetty
++int    savetty(void)
++               { return(*(int *)0); }
++
++#undef resetty_sp
++int    resetty_sp(
++               SCREEN  *sp)
++               { return(*(int *)0); }
++
++#undef resetty
++int    resetty(void)
++               { return(*(int *)0); }
++
++/* ./tty/lib_twait.c */
++
++#undef _nc_timed_wait
++int    _nc_timed_wait(
++               SCREEN  *sp, 
++               int     mode, 
++               int     milliseconds, 
++               int     *timeleft)
++               { return(*(int *)0); }
++
++/* ./tinfo/name_match.c */
++
++#undef _nc_first_name
++char   *_nc_first_name(
++               const char *const sp)
++               { return(*(char **)0); }
++
++#undef _nc_name_match
++int    _nc_name_match(
++               const char *const namelst, 
++               const char *const name, 
++               const char *const delim)
++               { return(*(int *)0); }
++
++/* ./names.c */
++
++#undef boolnames
++char   *const boolnames[] = {0};
++#undef boolfnames
++char   *const boolfnames[] = {0};
++#undef numnames
++char   *const numnames[] = {0};
++#undef numfnames
++char   *const numfnames[] = {0};
++#undef strnames
++char   *const strnames[] = {0};
++#undef strfnames
++char   *const strfnames[] = {0};
++
++/* ./tinfo/read_entry.c */
++
++#include <hashed_db.h>
++
++#undef _nc_read_termtype
++int    _nc_read_termtype(
++               TERMTYPE *ptr, 
++               char    *buffer, 
++               int     limit)
++               { return(*(int *)0); }
++
++#undef _nc_read_file_entry
++int    _nc_read_file_entry(
++               const char *const filename, 
++               TERMTYPE *ptr)
++               { return(*(int *)0); }
++
++#undef _nc_read_entry
++int    _nc_read_entry(
++               const char *const name, 
++               char    *const filename, 
++               TERMTYPE *const tp)
++               { return(*(int *)0); }
++
++/* ./tinfo/read_termcap.c */
++
++#include <sys/types.h>
++
++#undef _nc_read_termcap
++void   _nc_read_termcap(void)
++               { /* void */ }
++
++/* ./tinfo/setbuf.c */
++
++#undef _nc_set_buffer_sp
++void   _nc_set_buffer_sp(
++               SCREEN  *sp, 
++               FILE    *ofp, 
++               int     buffered)
++               { /* void */ }
++
++#undef _nc_set_buffer
++void   _nc_set_buffer(
++               FILE    *ofp, 
++               int     buffered)
++               { /* void */ }
++
++/* ./tinfo/strings.c */
++
++#undef _nc_str_init
++string_desc *_nc_str_init(
++               string_desc *dst, 
++               char    *src, 
++               size_t  len)
++               { return(*(string_desc **)0); }
++
++#undef _nc_str_null
++string_desc *_nc_str_null(
++               string_desc *dst, 
++               size_t  len)
++               { return(*(string_desc **)0); }
++
++#undef _nc_str_copy
++string_desc *_nc_str_copy(
++               string_desc *dst, 
++               string_desc *src)
++               { return(*(string_desc **)0); }
++
++#undef _nc_safe_strcat
++NCURSES_BOOL _nc_safe_strcat(
++               string_desc *dst, 
++               const char *src)
++               { return(*(NCURSES_BOOL *)0); }
++
++#undef _nc_safe_strcpy
++NCURSES_BOOL _nc_safe_strcpy(
++               string_desc *dst, 
++               const char *src)
++               { return(*(NCURSES_BOOL *)0); }
++
++/* ./trace/trace_buf.c */
++
++#undef _nc_trace_buf
++char   *_nc_trace_buf(
++               int     bufnum, 
++               size_t  want)
++               { return(*(char **)0); }
++
++#undef _nc_trace_bufcat
++char   *_nc_trace_bufcat(
++               int     bufnum, 
++               const char *value)
++               { return(*(char **)0); }
++
++/* ./trace/trace_tries.c */
++
++#undef _nc_trace_tries
++void   _nc_trace_tries(
++               TRIES   *tree)
++               { /* void */ }
++
++/* ./base/tries.c */
++
++#undef _nc_expand_try
++char   *_nc_expand_try(
++               TRIES   *tree, 
++               unsigned code, 
++               int     *count, 
++               size_t  len)
++               { return(*(char **)0); }
++
++#undef _nc_remove_key
++int    _nc_remove_key(
++               TRIES   **tree, 
++               unsigned code)
++               { return(*(int *)0); }
++
++#undef _nc_remove_string
++int    _nc_remove_string(
++               TRIES   **tree, 
++               const char *string)
++               { return(*(int *)0); }
++
++/* ./tinfo/trim_sgr0.c */
++
++#undef _nc_trim_sgr0
++char   *_nc_trim_sgr0(
++               TERMTYPE *tp)
++               { return(*(char **)0); }
++
++/* ./unctrl.c */
++
++#undef unctrl_sp
++char   *unctrl_sp(
++               SCREEN  *sp, 
++               chtype  ch)
++               { return(*(char **)0); }
++
++#undef unctrl
++char   *unctrl(
++               chtype  ch)
++               { return(*(char **)0); }
++
++/* ./trace/visbuf.c */
++
++#undef _nc_visbuf2
++const char *_nc_visbuf2(
++               int     bufnum, 
++               const char *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_visbuf
++const char *_nc_visbuf(
++               const char *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_visbufn
++const char *_nc_visbufn(
++               const char *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viswbuf2
++const char *_nc_viswbuf2(
++               int     bufnum, 
++               const wchar_t *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_viswbuf
++const char *_nc_viswbuf(
++               const wchar_t *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_viswbufn
++const char *_nc_viswbufn(
++               const wchar_t *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viswibuf
++const char *_nc_viswibuf(
++               const wint_t *buf)
++               { return(*(const char **)0); }
++
++#undef _nc_viscbuf2
++const char *_nc_viscbuf2(
++               int     bufnum, 
++               const cchar_t *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++#undef _nc_viscbuf
++const char *_nc_viscbuf(
++               const cchar_t *buf, 
++               int     len)
++               { return(*(const char **)0); }
++
++/* ./base/define_key.c */
++
++#undef define_key_sp
++int    define_key_sp(
++               SCREEN  *sp, 
++               const char *str, 
++               int     keycode)
++               { return(*(int *)0); }
++
++#undef define_key
++int    define_key(
++               const char *str, 
++               int     keycode)
++               { return(*(int *)0); }
++
++/* ./tinfo/hashed_db.c */
++
++#undef _nc_hashed_db
++void   _nc_hashed_db(void)
++               { /* void */ }
++
++/* ./base/key_defined.c */
++
++#undef key_defined_sp
++int    key_defined_sp(
++               SCREEN  *sp, 
++               const char *str)
++               { return(*(int *)0); }
++
++#undef key_defined
++int    key_defined(
++               const char *str)
++               { return(*(int *)0); }
++
++/* ./base/keybound.c */
++
++#undef keybound_sp
++char   *keybound_sp(
++               SCREEN  *sp, 
++               int     code, 
++               int     count)
++               { return(*(char **)0); }
++
++#undef keybound
++char   *keybound(
++               int     code, 
++               int     count)
++               { return(*(char **)0); }
++
++/* ./base/keyok.c */
++
++#undef keyok_sp
++int    keyok_sp(
++               SCREEN  *sp, 
++               int     c, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++#undef keyok
++int    keyok(
++               int     c, 
++               NCURSES_BOOL flag)
++               { return(*(int *)0); }
++
++/* ./base/version.c */
++
++#undef curses_version
++const char *curses_version(void)
++               { return(*(const char **)0); }
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/MKcaptab.sh ncurses-5.9/ncurses/tinfo/MKcaptab.sh
---- ncurses-5.9.orig/ncurses/tinfo/MKcaptab.sh  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/MKcaptab.sh       2012-02-16 18:25:12.987818695 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/MKcaptab.sh  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/MKcaptab.sh       2012-08-25 19:58:00.033231285 +0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
@@ -35248 +49775 @@
  static int
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/access.c ncurses-5.9/ncurses/tinfo/access.c
---- ncurses-5.9.orig/ncurses/tinfo/access.c     2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/access.c  2012-02-16 18:25:12.987818695 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/access.c     2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/access.c  2012-08-25 19:58:00.913227124 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35266 +49793 @@
  
 -MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $")
-+MODULE_ID("$Id: access.c,v 1.20 2011/06/05 00:48:00 tom Exp $")
++MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $")
 +
 +#ifdef __TANDEM
@@ -35278 +49805 @@
  #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
  
-@@ -108,7 +115,11 @@
+@@ -108,24 +115,33 @@
  NCURSES_EXPORT(int)
  _nc_access(const char *path, int mode)
@@ -35291 +49818 @@
             && errno == ENOENT
             && strlen(path) < PATH_MAX) {
-@@ -121,11 +132,14 @@
+            char head[PATH_MAX];
+-           char *leaf = _nc_basename(strcpy(head, path));
++           char *leaf;
+ 
++           _nc_STRCPY(head, path, sizeof(head));
++           leaf = _nc_basename(head);
+            if (leaf == 0)
+                leaf = head;
+            *leaf = '\0';
             if (head == leaf)
-                (void) strcpy(head, ".");
+-               (void) strcpy(head, ".");
++               _nc_STRCPY(head, ".", sizeof(head));
  
 -           return access(head, R_OK | W_OK | X_OK);
@@ -35309 +49845 @@
  
  NCURSES_EXPORT(bool)
-@@ -135,7 +149,7 @@
+@@ -135,7 +151,7 @@
      struct stat sb;
  
@@ -35318 +49854 @@
      }
      return result;
-@@ -148,7 +162,7 @@
+@@ -148,7 +164,7 @@
      struct stat sb;
  
@@ -35327 +49863 @@
      }
      return result;
-@@ -170,6 +184,7 @@
+@@ -170,6 +186,7 @@
         || getgid() != getegid())
         return FALSE;
@@ -35337 +49873 @@
  #endif
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/alloc_entry.c ncurses-5.9/ncurses/tinfo/alloc_entry.c
---- ncurses-5.9.orig/ncurses/tinfo/alloc_entry.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/alloc_entry.c     2012-02-16 18:25:12.987818695 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/alloc_entry.c        2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/alloc_entry.c     2012-08-25 19:58:00.913227124 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35351 +49887 @@
  
 -MODULE_ID("$Id: alloc_entry.c,v 1.51 2010/12/25 23:06:01 tom Exp $")
-+MODULE_ID("$Id: alloc_entry.c,v 1.52 2011/10/22 16:34:50 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.56 2012/02/22 22:34:31 tom Exp $")
  
  #define ABSENT_OFFSET    -1
@@ -35364 +49900 @@
  #if NCURSES_XNAMES
      tp->num_Booleans = BOOLCOUNT;
+@@ -131,7 +131,7 @@
+            result = (stringbuf + next_free - 1);
+        }
+     } else if (next_free + len < MAX_STRTAB) {
+-       strcpy(&stringbuf[next_free], string);
++       _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
+        DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
+        DEBUG(7, ("at location %d", (int) next_free));
+        next_free += len;
+@@ -216,16 +216,19 @@
+        if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) {
+            if (n < SIZEOF(offsets)) {
+                size_t length = 0;
++               size_t offset;
+                for (i = 0; i < n; i++) {
+                    length += strlen(tp->ext_Names[i]) + 1;
+                    offsets[i] = (int) (tp->ext_Names[i] - stringbuf);
+                }
+                if ((tp->ext_str_table = typeMalloc(char, length)) == 0)
+                      _nc_err_abort(MSG_NO_MEMORY);
+-               for (i = 0, length = 0; i < n; i++) {
+-                   tp->ext_Names[i] = tp->ext_str_table + length;
+-                   strcpy(tp->ext_Names[i], stringbuf + offsets[i]);
+-                   length += strlen(tp->ext_Names[i]) + 1;
++               for (i = 0, offset = 0; i < n; i++) {
++                   tp->ext_Names[i] = tp->ext_str_table + offset;
++                   _nc_STRCPY(tp->ext_Names[i],
++                              stringbuf + offsets[i],
++                              length - offset);
++                   offset += strlen(tp->ext_Names[i]) + 1;
+                }
+            }
+        }
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/alloc_ttype.c ncurses-5.9/ncurses/tinfo/alloc_ttype.c
+--- ncurses-5.9.orig/ncurses/tinfo/alloc_ttype.c        2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/alloc_ttype.c     2012-08-25 19:58:00.959893570 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1999-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1999-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -42,7 +42,7 @@
+ 
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: alloc_ttype.c,v 1.22 2010/12/19 00:24:09 tom Exp $")
++MODULE_ID("$Id: alloc_ttype.c,v 1.24 2012/03/01 01:21:56 tom Exp $")
+ 
+ #if NCURSES_XNAMES
+ /*
+@@ -473,7 +473,7 @@
+ #endif
+ 
+ NCURSES_EXPORT(void)
+-_nc_copy_termtype(TERMTYPE *dst, TERMTYPE *src)
++_nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src)
+ {
+     unsigned i;
+ 
+@@ -482,13 +482,15 @@
+     dst->Numbers = typeMalloc(short, NUM_NUMBERS(dst));
+     dst->Strings = typeMalloc(char *, NUM_STRINGS(dst));
+ 
+-    /* FIXME: use memcpy for these and similar loops */
+-    for_each_boolean(i, dst)
+-       dst->Booleans[i] = src->Booleans[i];
+-    for_each_number(i, dst)
+-       dst->Numbers[i] = src->Numbers[i];
+-    for_each_string(i, dst)
+-       dst->Strings[i] = src->Strings[i];
++    memcpy(dst->Booleans,
++          src->Booleans,
++          NUM_BOOLEANS(dst) * sizeof(dst->Booleans[0]));
++    memcpy(dst->Numbers,
++          src->Numbers,
++          NUM_NUMBERS(dst) * sizeof(dst->Numbers[0]));
++    memcpy(dst->Strings,
++          src->Strings,
++          NUM_STRINGS(dst) * sizeof(dst->Strings[0]));
+ 
+     /* FIXME: we probably should also copy str_table and ext_str_table,
+      * but tic and infocmp are not written to exploit that (yet).
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/captoinfo.c ncurses-5.9/ncurses/tinfo/captoinfo.c
---- ncurses-5.9.orig/ncurses/tinfo/captoinfo.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/captoinfo.c       2012-02-16 18:25:12.987818695 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/captoinfo.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/captoinfo.c       2012-08-25 19:58:00.913227124 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35379 +49999 @@
  
 -MODULE_ID("$Id: captoinfo.c,v 1.58 2010/12/04 20:08:19 tom Exp $")
-+MODULE_ID("$Id: captoinfo.c,v 1.70 2011/10/22 14:59:34 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.72 2012/02/22 22:40:24 tom Exp $")
  
  #define MAX_PUSHED     16      /* max # args we can push onto the stack */
+ 
+@@ -133,7 +133,7 @@
+            _nc_err_abort(MSG_NO_MEMORY);
+        d = my_string + have;
+     }
+-    (void) strcpy(d, s);
++    _nc_STRCPY(d, s, my_length - have);
+     return d + strlen(d);
+ }
  
 @@ -240,6 +240,12 @@
@@ -35482 +50111 @@
      }
  
+@@ -578,7 +515,7 @@
+        {
+            char buffer[80];
+            int tst;
+-           sprintf(buffer, fmt, ch1, ch2);
++           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) fmt, ch1, ch2);
+            tst = strlen(buffer) - 1;
+            assert(len == tst);
+        }
+@@ -598,9 +535,9 @@
+        bufptr = save_char(bufptr, c1);
+     } else {
+        if (c1 == (c1 & 0x1f))  /* iscntrl() returns T on 255 */
+-           (void) strcpy(temp, unctrl((chtype) c1));
++           _nc_STRCPY(temp, unctrl((chtype) c1), sizeof(temp));
+        else
+-           (void) sprintf(temp, "\\%03o", c1);
++           _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "\\%03o", c1);
+        bufptr = save_string(bufptr, temp);
+     }
+     return bufptr;
 @@ -646,13 +583,15 @@
      int in0, in1, in2;
@@ -35509 +50159 @@
         char *cp = 0;
  
-@@ -685,8 +624,71 @@
+@@ -685,8 +624,72 @@
             } else if (str[1] == ',') {
                 bufptr = save_char(bufptr, *++str);
@@ -35570 +50220 @@
 +                       default:
 +                           /* should not happen, but handle this anyway */
-+                           sprintf(octal, "%03o", UChar(xx1));
++                           _nc_SPRINTF(octal, _nc_SLIMIT(sizeof(octal))
++                                       "%03o", UChar(xx1));
 +                           bufptr = save_char(bufptr, octal[0]);
 +                           bufptr = save_char(bufptr, octal[1]);
@@ -35582 +50233 @@
         } else if (str[0] == '$' && str[1] == '<') {    /* discard padding */
             str += 2;
-@@ -720,13 +722,13 @@
+@@ -720,13 +723,13 @@
             bufptr = save_tc_inequality(bufptr, c1, c2);
         } else if (sscanf(str, "%%?%%{%d}%%>%%t%%'%c'%%+%%;", &c1, &ch2) == 2) {
@@ -35599 +50250 @@
             str += len;
             bufptr = save_string(bufptr, "%B");
-@@ -741,15 +743,15 @@
+@@ -741,15 +744,15 @@
             bufptr = save_tc_char(bufptr, c1);
         }
@@ -35618 +50269 @@
             if (saw_n++ == 0) {
                 bufptr = save_string(bufptr, "%m");
-@@ -772,8 +774,25 @@
+@@ -772,8 +775,25 @@
             case '8':
             case '9':
@@ -35646 +50297 @@
                     if (*str != 'd')    /* termcap doesn't have octal, hex */
                         return 0;
-@@ -794,6 +813,8 @@
+@@ -794,6 +814,8 @@
                  * termcap notation.
                  */
@@ -35656 +50307 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_error.c ncurses-5.9/ncurses/tinfo/comp_error.c
---- ncurses-5.9.orig/ncurses/tinfo/comp_error.c 2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/comp_error.c      2012-02-16 18:25:12.987818695 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/comp_error.c 2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/comp_error.c      2012-08-25 19:58:00.913227124 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35670 +50321 @@
  
 -MODULE_ID("$Id: comp_error.c,v 1.31 2007/04/21 23:38:32 tom Exp $")
-+MODULE_ID("$Id: comp_error.c,v 1.33 2011/10/22 16:34:50 tom Exp $")
++MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $")
  
  NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
@@ -35693 +50344 @@
  }
  
+@@ -84,7 +85,7 @@
+     }
+ #endif
+     if (name != 0)
+-       strcpy(name, TermType != 0 ? TermType : "");
++       _nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE);
+ }
+ 
+ static NCURSES_INLINE void
+@@ -151,3 +152,12 @@
+     exit(EXIT_FAILURE);
+ #endif
+ }
++
++#if NO_LEAKS
++NCURSES_EXPORT(void)
++_nc_comp_error_leaks(void)
++{
++    FreeAndNull(SourceName);
++    FreeAndNull(TermType);
++}
++#endif
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_expand.c ncurses-5.9/ncurses/tinfo/comp_expand.c
---- ncurses-5.9.orig/ncurses/tinfo/comp_expand.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/comp_expand.c     2012-02-16 18:25:12.987818695 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/comp_expand.c        2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/comp_expand.c     2012-08-25 19:58:01.059893097 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35708 +50381 @@
  
 -MODULE_ID("$Id: comp_expand.c,v 1.21 2010/01/16 17:11:23 tom Exp $")
-+MODULE_ID("$Id: comp_expand.c,v 1.22 2011/05/21 18:55:07 tom Exp $")
++MODULE_ID("$Id: comp_expand.c,v 1.25 2012/03/24 18:37:17 tom Exp $")
  
  static int
  trailing_spaces(const char *src)
-@@ -61,15 +61,15 @@
+@@ -49,6 +49,8 @@
+ #define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
+ #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
+ 
++#define P_LIMIT(p) (length - (size_t)(p))
++
+ NCURSES_EXPORT(char *)
+ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
+ {
+@@ -61,15 +63,15 @@
      size_t need = (2 + strlen(str)) * 4;
      int ch;
@@ -35730 +50412 @@
         if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
               return 0;
+@@ -90,7 +92,8 @@
+                    && str[1] != '\\'
+                    && REALPRINT(str + 1)
+                    && str[2] == S_QUOTE) {
+-                   sprintf(buffer + bufp, "{%d}", str[1]);
++                   _nc_SPRINTF(buffer + bufp, _nc_SLIMIT(P_LIMIT(bufp))
++                               "{%d}", str[1]);
+                    bufp += (int) strlen(buffer + bufp);
+                    str += 2;
+                } else {
+@@ -177,10 +180,12 @@
+ #define UnCtl(c) ((c) + '@')
+        else if (REALCTL(str) && ch != '\\'
+                 && (!islong || isdigit(UChar(str[1])))) {
+-           (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch));
++           _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp))
++                       "^%c", UnCtl(ch));
+            bufp += 2;
+        } else {
+-           (void) sprintf(&buffer[bufp], "\\%03o", ch);
++           _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp))
++                       "\\%03o", ch);
+            bufp += 4;
+        }
+ 
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_parse.c ncurses-5.9/ncurses/tinfo/comp_parse.c
---- ncurses-5.9.orig/ncurses/tinfo/comp_parse.c 2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/comp_parse.c      2012-02-16 18:25:13.231825133 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/comp_parse.c 2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/comp_parse.c      2012-08-25 19:58:01.233225611 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35761 +50468 @@
  
 -MODULE_ID("$Id: comp_parse.c,v 1.73 2010/12/25 23:06:37 tom Exp $")
-+MODULE_ID("$Id: comp_parse.c,v 1.79 2012/01/28 21:49:23 tom Exp $")
++MODULE_ID("$Id: comp_parse.c,v 1.85 2012/04/14 23:30:10 tom Exp $")
  
  static void sanity_check2(TERMTYPE *, bool);
@@ -35774 +50481 @@
  enqueue(ENTRY * ep)
  /* add an entry to the in-core list */
-@@ -93,9 +90,21 @@
+@@ -86,16 +83,28 @@
+        if (len > MAX_NAME_SIZE)
+            len = MAX_NAME_SIZE;
+        (void) strncpy(dst, src, len);
+-       (void) strcpy(dst + len, "|");
++       _nc_STRCPY(dst + len, "|", MAX_NAME_SIZE);
+        src = dst;
+     }
+     return src;
  }
  #define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src)
@@ -35931 +50646 @@
      if (multiples > 0)
         return (FALSE);
-@@ -378,7 +470,15 @@
+@@ -378,7 +470,34 @@
             for_entry_list(qp) {
                 _nc_curr_line = (int) qp->startline;
@@ -35941 +50656 @@
 +                */
 +               if (_nc_check_termtype2 != sanity_check2) {
++                   SCREEN *save_SP = SP;
++                   SCREEN fake_sp;
++                   TERMINAL fake_tm;
++                   TERMINAL *save_tm = cur_term;
++
++                   /*
++                    * Setup so that tic can use ordinary terminfo interface
++                    * to obtain capability information.
++                    */
++                   memset(&fake_sp, 0, sizeof(fake_sp));
++                   memset(&fake_tm, 0, sizeof(fake_tm));
++                   fake_sp._term = &fake_tm;
++                   fake_tm.type = qp->tterm;
++                   SP = &fake_sp;
++                   set_curterm(&fake_tm);
++
 +                   _nc_check_termtype2(&qp->tterm, literal);
++
++                   SP = save_SP;
++                   set_curterm(save_tm);
 +               } else {
 +                   fixup_acsc(&qp->tterm, literal);
@@ -35948 +50682 @@
             DEBUG(2, ("SANITY CHECK FINISHED"));
         }
-@@ -403,6 +503,17 @@
+@@ -403,6 +522,17 @@
  #define CUR tp->
  
@@ -35966 +50700 @@
  {
      if (!PRESENT(exit_attribute_mode)) {
-@@ -428,10 +539,7 @@
+@@ -428,10 +558,7 @@
       * prefer to bypass it...
       */
@@ -35979 +50713 @@
      }
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_scan.c ncurses-5.9/ncurses/tinfo/comp_scan.c
---- ncurses-5.9.orig/ncurses/tinfo/comp_scan.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/comp_scan.c       2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/comp_scan.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/comp_scan.c       2012-08-25 19:58:01.316558550 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35993 +50727 @@
  
 -MODULE_ID("$Id: comp_scan.c,v 1.89 2010/12/25 23:06:37 tom Exp $")
-+MODULE_ID("$Id: comp_scan.c,v 1.94 2011/10/22 15:46:43 tom Exp $")
++MODULE_ID("$Id: comp_scan.c,v 1.100 2012/04/29 00:20:51 tom Exp $")
  
  /*
@@ -36005 +50739 @@
  NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */
  NCURSES_EXPORT_VAR (long) _nc_comment_end = 0;   /* end of comment range before name */
-@@ -256,12 +257,12 @@
+@@ -127,14 +128,19 @@
+  *     Returns the final nonblank character on the current input buffer
+  */
+ static int
+-last_char(void)
++last_char(int from_end)
+ {
+     size_t len = strlen(bufptr);
++    int result = 0;
++
+     while (len--) {
+-       if (!isspace(UChar(bufptr[len])))
+-           return bufptr[len];
++       if (!isspace(UChar(bufptr[len]))) {
++           if (from_end < (int) len)
++               result = bufptr[(int) len - from_end];
++           break;
++       }
+     }
+-    return 0;
++    return result;
+ }
+ 
+ /*
+@@ -195,7 +201,8 @@
+                    result = typeRealloc(char, allocated, result);
+                    if (result == 0)
+                        return (EOF);
+-                   bufstart = result;
++                   if (bufstart)
++                       bufstart = result;
+                }
+                if (used == 0)
+                    _nc_curr_file_pos = ftell(yyin);
+@@ -212,7 +219,7 @@
+                    }
+                } else {
+                    if (used != 0)
+-                       strcat(result, "\n");
++                       _nc_STRCAT(result, "\n", allocated);
+                }
+                if ((bufptr = bufstart) != 0) {
+                    used = strlen(bufptr);
+@@ -256,12 +263,12 @@
  }
  
@@ -36020 +50797 @@
  }
  
-@@ -299,6 +300,8 @@
+@@ -299,6 +306,8 @@
         *tok_ptr++ = (char) ch; \
         *tok_ptr = '\0'
@@ -36029 +50806 @@
   *     int
   *     get_token()
-@@ -336,7 +339,6 @@
+@@ -336,15 +345,14 @@
  _nc_get_token(bool silent)
  {
@@ -36035 +50812 @@
 -    static char *tok_buf;
  
-     char *after_list;
-     char *after_name;
-@@ -376,7 +378,6 @@
+-    char *after_list;
+-    char *after_name;
++    char *after_name;          /* after primary name */
++    char *after_list;          /* after primary and alias list */
+     char *numchk;
+     char *tok_ptr;
+     char *s;
+     char numbuf[80];
+-    int ch;
++    int ch, c0, c1;
+     int dot_flag = FALSE;
+     int type;
+     long number;
+@@ -376,7 +384,6 @@
         if (tok_buf != 0) {
             if (_nc_curr_token.tk_name == tok_buf)
@@ -36045 +50833 @@
         return (EOF);
      }
-@@ -390,6 +391,7 @@
+@@ -390,6 +397,7 @@
      }
  
@@ -36053 +50841 @@
  #ifdef TRACE
      old_line = _nc_curr_line;
-@@ -748,7 +750,7 @@
+@@ -457,7 +465,7 @@
+                    after_list = tok_ptr;
+                    if (after_name == 0)
+                        after_name = tok_ptr;
+-               } else if (ch == ':' && last_char() != ',') {
++               } else if (ch == ':' && last_char(0) != ',') {
+                    _nc_syntax = SYN_TERMCAP;
+                    separator = ':';
+                    break;
+@@ -471,12 +479,64 @@
+                    if (after_name == 0)
+                        break;
+                    /*
+-                    * If we see a comma, we assume this is terminfo unless we
+-                    * subsequently run into a colon.  But we don't stop
+-                    * looking for a colon until hitting a newline.  This
+-                    * allows commas to be embedded in description fields of
+-                    * either syntax.
++                    * We saw a comma, but are not entirely sure this is
++                    * terminfo format, since we can still be parsing the
++                    * description field (for either syntax).
++                    *
++                    * A properly formatted termcap line ends with either a
++                    * colon, or a backslash after a colon.  It is possible
++                    * to have a backslash in the middle of a capability, but
++                    * then there would be no leading whitespace on the next
++                    * line - something we want to discourage.
+                     */
++                   c0 = last_char(0);
++                   c1 = last_char(1);
++                   if (c1 != ':' && c0 != '\\' && c0 != ':') {
++                       bool capability = FALSE;
++
++                       /*
++                        * Since it is not termcap, assume the line is terminfo
++                        * format.  However, the comma can be embedded in a
++                        * description field.  It also can be a separator
++                        * between a description field and a capability.
++                        *
++                        * Improve the guess by checking if the next word after
++                        * the comma does not look like a capability.  In that
++                        * case, extend the description past the comma.
++                        */
++                       for (s = bufptr; isspace(UChar(*s)); ++s) {
++                           ;
++                       }
++                       if (islower(UChar(*s))) {
++                           char *name = s;
++                           while (isalnum(UChar(*s))) {
++                               ++s;
++                           }
++                           if (*s == '#' || *s == '=' || *s == '@') {
++                               /*
++                                * Checking solely with syntax allows us to
++                                * support extended capabilities with string
++                                * values.
++                                */
++                               capability = TRUE;
++                           } else if (*s == ',') {
++                               c0 = *s;
++                               *s = '\0';
++                               /*
++                                * Otherwise, we can handle predefined boolean
++                                * capabilities, still aided by syntax.
++                                */
++                               if (_nc_find_entry(name,
++                                                  _nc_get_hash_table(FALSE))) {
++                                   capability = TRUE;
++                               }
++                               *s = (char) c0;
++                           }
++                       }
++                       if (capability) {
++                           break;
++                       }
++                   }
+                } else
+                    ch = eat_escaped_newline(ch);
+ 
+@@ -748,7 +808,7 @@
             if (!(is7bits(c) && isprint(c))) {
                 _nc_warning("Illegal ^ character - '%s'", unctrl(UChar(c)));
@@ -36062 +50929 @@
                 if (_nc_tracing)
                     _nc_warning("Allow ^? as synonym for \\177");
-@@ -758,23 +760,29 @@
+@@ -758,23 +818,29 @@
                 *(ptr++) = (char) (c);
             }
@@ -36097 +50964 @@
                         }
                     }
-@@ -782,21 +790,16 @@
+@@ -782,21 +848,16 @@
                     number = number * 8 + c - '0';
                 }
@@ -36121 +50988 @@
                     *(ptr++) = '\n';
                     break;
-@@ -809,10 +812,6 @@
+@@ -809,10 +870,6 @@
                     *(ptr++) = '\010';
                     break;
@@ -36132 +50999 @@
                     *(ptr++) = '\014';
                     break;
-@@ -833,16 +832,33 @@
+@@ -833,16 +890,33 @@
                     *(ptr++) = ',';
                     break;
@@ -36172 +51039 @@
                 case '|':
                     *(ptr++) = (char) c;
-@@ -862,7 +878,7 @@
+@@ -862,7 +936,7 @@
  
         if (!ignored) {
@@ -36181 +51048 @@
                 break;
             }
-@@ -934,5 +950,8 @@
+@@ -934,5 +1008,8 @@
      if (pushname != 0) {
         FreeAndNull(pushname);
@@ -36191 +51058 @@
  #endif
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/db_iterator.c ncurses-5.9/ncurses/tinfo/db_iterator.c
---- ncurses-5.9.orig/ncurses/tinfo/db_iterator.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/db_iterator.c     2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/db_iterator.c        2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/db_iterator.c     2012-08-25 19:58:01.863222632 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36200 +51067 @@
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -36,13 +36,135 @@
+@@ -36,13 +36,142 @@
  
  #include <curses.priv.h>
@@ -36212 +51079 @@
 +#endif
 +
-+MODULE_ID("$Id: db_iterator.c,v 1.28 2012/01/21 23:56:17 tom Exp $")
++MODULE_ID("$Id: db_iterator.c,v 1.34 2012/06/30 16:30:10 tom Exp $")
  
  #define HaveTicDirectory _nc_globals.have_tic_directory
@@ -36224 +51091 @@
 +
 +static void
-+add_to_blob(const char *text)
++add_to_blob(const char *text, size_t limit)
 +{
++    (void) limit;
++
 +    if (*text != '\0') {
 +       char *last = my_blob + strlen(my_blob);
 +       if (last != my_blob)
 +           *last++ = NCURSES_PATHSEP;
-+       strcpy(last, text);
++       _nc_STRCPY(last, text, limit);
 +    }
 +}
@@ -36246 +51115 @@
 +    else if (strlen(name) < PATH_MAX - sizeof(DBM_SUFFIX)) {
 +       char temp[PATH_MAX];
-+       sprintf(temp, "%s%s", name, DBM_SUFFIX);
++       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", name, DBM_SUFFIX);
 +       if (stat(temp, sb) == 0 && S_ISREG(sb->st_mode)) {
 +           result = TRUE;
@@ -36263 +51132 @@
 +{
 +    bool result = FALSE;
-+    char *value = getenv(name);
 +
 +    if (which < dbdLAST) {
-+       if (my_vars[which].name == 0 || strcmp(my_vars[which].name, name)) {
++       char *value;
++
++       if ((value = getenv(name)) == 0 || (value = strdup(value)) == 0) {
++           ;
++       } else if (my_vars[which].name == 0 || strcmp(my_vars[which].name, name)) {
 +           FreeIfNeeded(my_vars[which].value);
 +           my_vars[which].name = name;
@@ -36279 +51151 @@
 +           my_vars[which].value = value;
 +           result = TRUE;
++       } else {
++           free(value);
 +       }
 +    }
@@ -36337 +51211 @@
  /*
   * Record the "official" location of the terminfo directory, according to
-@@ -51,6 +173,7 @@
+@@ -51,6 +180,7 @@
  NCURSES_EXPORT(const char *)
  _nc_tic_dir(const char *path)
@@ -36345 +51219 @@
         if (path != 0) {
             TicDirectory = path;
-@@ -61,7 +184,7 @@
+@@ -61,7 +191,7 @@
                 return _nc_tic_dir(envp);
         }
@@ -36354 +51228 @@
  
  /*
-@@ -77,61 +200,16 @@
+@@ -77,61 +207,16 @@
  }
  
@@ -36372 +51246 @@
 -    if (ThisDbList != 0) {
 -       FreeAndNull(ThisDbList);
-+    if (my_blob != 0 && cache_expired()) {
-+       free_cache();
-     }
+-    }
 -    ThisDbSize = 0;
- }
- 
+-}
+-
 -/* The TERMINFO_DIRS value, if defined by the configure script, begins with a
 - * ":", which will be interpreted as TERMINFO.
@@ -36409 +51281 @@
 -           result = system_db;
 -       return result;
--    }
++    if (my_blob != 0 && cache_expired()) {
++       free_cache();
+     }
 -    return 0;
--}
--
+ }
+ 
 -#define NEXT_DBD(var, offset) next_list_item((*offset == 0) ? var : 0, offset)
 -
@@ -36418 +51292 @@
   * This is a simple iterator which allows the caller to step through the
   * possible locations for a terminfo directory.  ncurses uses this to find
-@@ -141,84 +219,175 @@
+@@ -141,84 +226,186 @@
  _nc_next_db(DBDIRS * state, int *offset)
  {
@@ -36445 +51319 @@
 +_nc_first_db(DBDIRS * state, int *offset)
 +{
++    bool cache_has_expired = FALSE;
 +    *state = dbdTIC;
 +    *offset = 0;
@@ -36453 +51328 @@
 +     * table.
 +     */
-+    if (my_blob == 0) {
++    if (my_blob == 0 || (cache_has_expired = cache_expired())) {
 +       size_t blobsize = 0;
 +       const char *values[dbdLAST];
 +       struct stat *my_stat;
 +       int j, k;
++
++       if (cache_has_expired)
++           free_cache();
 +
 +       for (j = 0; j < dbdLAST; ++j)
@@ -36564 +51442 @@
 +           *my_blob = '\0';
 +           for (j = 0; j < dbdLAST; ++j) {
-+               add_to_blob(values[j]);
++               add_to_blob(values[j], blobsize);
 +           }
 +
@@ -36651 +51529 @@
 -    *state = dbdTIC;
 -    *offset = 0;
++    DBDIRS which;
++
 +    if (my_blob != 0)
 +       FreeAndNull(my_blob);
 +    if (my_list != 0)
 +       FreeAndNull(my_list);
++    for (which = 0; which < dbdLAST; ++which) {
++       my_vars[which].name = 0;
++       FreeIfNeeded(my_vars[which].value);
++       my_vars[which].value = 0;
++    }
  }
 +#endif
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/doalloc.c ncurses-5.9/ncurses/tinfo/doalloc.c
+--- ncurses-5.9.orig/ncurses/tinfo/doalloc.c    2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/doalloc.c 2012-08-25 19:58:00.916560441 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
++ * Copyright (c) 1998-2000,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -39,7 +39,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: doalloc.c,v 1.8 2002/08/31 21:48:11 Philippe.Blain Exp $")
++MODULE_ID("$Id: doalloc.c,v 1.10 2012/02/22 22:34:31 tom Exp $")
+ 
+ NCURSES_EXPORT(void *)
+ _nc_doalloc(void *oldp, size_t amount)
+@@ -63,9 +63,10 @@
+ {
+     char *dst;
+     if (src != 0) {
+-       dst = typeMalloc(char, strlen(src) + 1);
++       size_t need = strlen(src) + 1;
++       dst = typeMalloc(char, need);
+        if (dst != 0) {
+-           (void) strcpy(dst, src);
++           _nc_STRCPY(dst, src, need);
+        }
+     } else {
+        dst = 0;
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/entries.c ncurses-5.9/ncurses/tinfo/entries.c
---- ncurses-5.9.orig/ncurses/tinfo/entries.c    2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/entries.c 2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/entries.c    2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/entries.c 2012-08-25 19:58:01.376558266 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2006-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2006-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2006-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36672 +51589 @@
  
 -MODULE_ID("$Id: entries.c,v 1.17 2010/01/23 17:57:43 tom Exp $")
-+MODULE_ID("$Id: entries.c,v 1.19 2011/10/22 16:34:50 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.21 2012/05/05 20:33:44 tom Exp $")
  
  /****************************************************************************
   *
-@@ -128,6 +128,7 @@
+@@ -96,6 +96,9 @@
+            if (last != 0) {
+                last->next = ep->next;
+            }
++           if (ep->next != 0) {
++               ep->next->last = last;
++           }
+            if (ep == _nc_head) {
+                _nc_head = ep->next;
+            }
+@@ -128,19 +131,21 @@
      _nc_free_entries(_nc_head);
      _nc_get_type(0);
@@ -36684 +51611 @@
  #if BROKEN_LINKER || USE_REENTRANT
      _nc_names_leaks();
-@@ -140,7 +141,7 @@
+     _nc_codes_leaks();
+     FreeIfNeeded(_nc_prescreen.real_acs_map);
+ #endif
++    _nc_comp_error_leaks();
+ 
+     if ((s = _nc_home_terminfo()) != 0)
+        free(s);
  
  #ifdef TRACE
@@ -36693 +51626 @@
  
  #endif /* NO_LEAKS */
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/getenv_num.c ncurses-5.9/ncurses/tinfo/getenv_num.c
+--- ncurses-5.9.orig/ncurses/tinfo/getenv_num.c 2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/getenv_num.c      2012-08-25 19:58:01.999888649 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
++ * Copyright (c) 1998-2000,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,7 +36,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: getenv_num.c,v 1.3 2000/12/10 02:55:07 tom Exp $")
++MODULE_ID("$Id: getenv_num.c,v 1.4 2012/07/14 21:17:19 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ _nc_getenv_num(const char *name)
+@@ -54,3 +54,20 @@
+ 
+     return (int) value;
+ }
++
++NCURSES_EXPORT(void)
++_nc_setenv_num(const char *name, int value)
++{
++    if (name != 0 && value >= 0) {
++       char buffer[128];
++#if HAVE_SETENV
++       sprintf(buffer, "%d", value);
++       setenv(name, buffer, 1);
++#elif HAVE_PUTENV
++       char *s;
++       sprintf(buffer, "%s=%d", name, value);
++       if ((s = strdup(buffer)) != 0)
++           putenv(s);
++#endif
++    }
++}
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/hashed_db.c ncurses-5.9/ncurses/tinfo/hashed_db.c
---- ncurses-5.9.orig/ncurses/tinfo/hashed_db.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/hashed_db.c       2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/hashed_db.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/hashed_db.c       2012-08-25 19:58:00.036564603 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36889 +51862 @@
      result = db->close(db, 0);
  #else
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/home_terminfo.c ncurses-5.9/ncurses/tinfo/home_terminfo.c
+--- ncurses-5.9.orig/ncurses/tinfo/home_terminfo.c      2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/home_terminfo.c   2012-08-25 19:58:00.916560441 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,7 +37,7 @@
+ #include <curses.priv.h>
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: home_terminfo.c,v 1.12 2010/12/25 23:43:58 tom Exp $")
++MODULE_ID("$Id: home_terminfo.c,v 1.14 2012/02/22 22:40:24 tom Exp $")
+ 
+ /* ncurses extension...fall back on user's private directory */
+ 
+@@ -57,7 +57,7 @@
+                MyBuffer = typeMalloc(char, want);
+                if (MyBuffer == 0)
+                    _nc_err_abort(MSG_NO_MEMORY);
+-               (void) sprintf(MyBuffer, PRIVATE_INFO, home);
++               _nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home);
+            }
+        }
+        result = MyBuffer;
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_data.c ncurses-5.9/ncurses/tinfo/lib_data.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_data.c   2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_data.c        2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_data.c   2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_data.c        2012-08-25 19:58:01.999888649 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36904 +51905 @@
  
 -MODULE_ID("$Id: lib_data.c,v 1.61 2010/05/15 22:06:56 tom Exp $")
-+MODULE_ID("$Id: lib_data.c,v 1.63 2011/10/08 21:03:29 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.64 2012/07/14 21:01:49 tom Exp $")
  
  /*
@@ -36930 +51931 @@
      0,                         /* _nc_windowlist */
  #endif
+@@ -249,6 +255,7 @@
+     NULL,                      /* _tputs_trace */
+ #endif
+ #endif
++    FALSE,                     /* use_tioctl */
+ };
+ /* *INDENT-ON* */
+ 
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_napms.c ncurses-5.9/ncurses/tinfo/lib_napms.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_napms.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_napms.c       2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_napms.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_napms.c       2012-08-25 19:58:01.863222632 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -51,32 +51,33 @@
+@@ -51,17 +51,21 @@
  #endif
  #endif
  
 -MODULE_ID("$Id: lib_napms.c,v 1.20 2009/11/07 20:37:30 tom Exp $")
-+MODULE_ID("$Id: lib_napms.c,v 1.21 2011/06/04 19:24:16 tom Exp $")
++MODULE_ID("$Id: lib_napms.c,v 1.23 2012/06/30 22:08:24 tom Exp $")
  
  NCURSES_EXPORT(int)
@@ -36953 +51962 @@
      T((T_CALLED("napms(%d)"), ms));
  
-+    if (HasTerminal(SP_PARM)) {
  #ifdef USE_TERM_DRIVER
 -    CallDriver_1(SP_PARM, nap, ms);
++    if (HasTerminal(SP_PARM)) {
 +       CallDriver_1(SP_PARM, nap, ms);
++    }
  #else /* !USE_TERM_DRIVER */
++#if NCURSES_SP_FUNCS
++    (void) sp;
++#endif
  #if HAVE_NANOSLEEP
--    {
--       struct timespec request, remaining;
--       request.tv_sec = ms / 1000;
--       request.tv_nsec = (ms % 1000) * 1000000;
--       while (nanosleep(&request, &remaining) == -1
--              && errno == EINTR) {
--           request = remaining;
-+       {
-+           struct timespec request, remaining;
-+           request.tv_sec = ms / 1000;
-+           request.tv_nsec = (ms % 1000) * 1000000;
-+           while (nanosleep(&request, &remaining) == -1
-+                  && errno == EINTR) {
-+               request = remaining;
-+           }
-        }
--    }
- #else
--    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
-+       _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
- #endif
- #endif /* !USE_TERM_DRIVER */
- 
-+    }
-     returnCode(OK);
- }
- 
+     {
+        struct timespec request, remaining;
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_options.c ncurses-5.9/ncurses/tinfo/lib_options.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_options.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_options.c     2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_options.c        2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_options.c     2012-08-25 19:58:00.039897921 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37015 +52003 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_print.c ncurses-5.9/ncurses/tinfo/lib_print.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_print.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_print.c       2012-02-16 18:25:12.991818801 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_print.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_print.c       2012-08-25 19:58:00.916560441 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37029 +52017 @@
  
 -MODULE_ID("$Id: lib_print.c,v 1.20 2010/06/05 22:18:35 tom Exp $")
-+MODULE_ID("$Id: lib_print.c,v 1.21 2011/10/22 16:34:50 tom Exp $")
++MODULE_ID("$Id: lib_print.c,v 1.23 2012/02/22 22:34:31 tom Exp $")
  
  NCURSES_EXPORT(int)
  NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
-@@ -77,7 +77,7 @@
+@@ -76,10 +76,10 @@
+        return (ERR);
      }
  
-     (void) strcpy(mybuf, switchon);
+-    (void) strcpy(mybuf, switchon);
 -    memcpy(mybuf + onsize, data, (unsigned) len);
++    _nc_STRCPY(mybuf, switchon, need);
 +    memcpy(mybuf + onsize, data, (size_t) len);
      if (offsize)
-        (void) strcpy(mybuf + onsize + len, prtr_off);
- 
+-       (void) strcpy(mybuf + onsize + len, prtr_off);
++       _nc_STRCPY(mybuf + onsize + len, prtr_off, need);
+ 
+     /*
+      * We're relying on the atomicity of UNIX writes here.  The
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_raw.c ncurses-5.9/ncurses/tinfo/lib_raw.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_raw.c    2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_raw.c 2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_raw.c    2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_raw.c 2012-08-25 19:58:00.396562900 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37114 +52107 @@
             termp->Nttyb = buf;
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_setup.c ncurses-5.9/ncurses/tinfo/lib_setup.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_setup.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_setup.c       2012-02-16 18:25:12.991818801 +0000
-@@ -43,15 +43,11 @@
+--- ncurses-5.9.orig/ncurses/tinfo/lib_setup.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_setup.c       2012-08-25 19:58:02.026555193 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -37,21 +37,18 @@
+  * Terminal setup routines common to termcap and terminfo:
+  *
+  *             use_env(bool)
++ *             use_tioctl(bool)
+  *             setupterm(char *, int, int *)
+  */
+ 
  #include <curses.priv.h>
  #include <tic.h>               /* for MAX_NAME_SIZE */
@@ -37129 +52136 @@
  
 -MODULE_ID("$Id: lib_setup.c,v 1.135 2011/02/06 01:04:21 tom Exp $")
-+MODULE_ID("$Id: lib_setup.c,v 1.142 2011/10/22 16:13:06 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.148 2012/07/21 18:05:41 tom Exp $")
  
  /****************************************************************************
   *
-@@ -225,6 +221,7 @@
+@@ -225,6 +222,7 @@
  {
      T((T_CALLED("use_env(%p,%d)"), (void *) SP_PARM, (int) f));
@@ -37141 +52148 @@
         SP_PARM->_use_env = f;
      }
-@@ -239,6 +236,7 @@
+@@ -234,14 +232,39 @@
+     returnVoid;
+ }
+ 
++NCURSES_EXPORT(void)
++NCURSES_SP_NAME(use_tioctl) (NCURSES_SP_DCLx bool f)
++{
++    T((T_CALLED("use_tioctl(%p,%d)"), (void *) SP_PARM, (int) f));
++#if NCURSES_SP_FUNCS
++    START_TRACE();
++    if (IsPreScreen(SP_PARM)) {
++       SP_PARM->_use_tioctl = f;
++    }
++#else
++    _nc_prescreen.use_tioctl = f;
++#endif
++    returnVoid;
++}
++
+ #if NCURSES_SP_FUNCS
+ NCURSES_EXPORT(void)
  use_env(bool f)
  {
@@ -37149 +52176 @@
      returnVoid;
  }
-@@ -414,22 +412,6 @@
++
++NCURSES_EXPORT(void)
++use_tioctl(bool f)
++{
++    T((T_CALLED("use_tioctl(%d)"), (int) f));
++    START_TRACE();
++    _nc_prescreen.use_tioctl = f;
++    returnVoid;
++}
+ #endif
+ 
+ NCURSES_EXPORT(void)
+@@ -281,7 +304,7 @@
+     *linep = (int) lines;
+     *colp = (int) columns;
+ 
+-    if (_nc_prescreen.use_env) {
++    if (_nc_prescreen.use_env || _nc_prescreen.use_tioctl) {
+        int value;
+ 
+ #ifdef __EMX__
+@@ -289,7 +312,9 @@
+            int screendata[2];
+            _scrsize(screendata);
+            *colp = screendata[0];
+-           *linep = screendata[1];
++           *linep = ((sp != 0 && sp->_filtered)
++                     ? 1
++                     : screendata[1]);
+            T(("EMX screen size: environment LINES = %d COLUMNS = %d",
+               *linep, *colp));
+        }
+@@ -315,19 +340,33 @@
+        }
+ #endif /* HAVE_SIZECHANGE */
+ 
+-       /*
+-        * Finally, look for environment variables.
+-        *
+-        * Solaris lets users override either dimension with an environment
+-        * variable.
+-        */
+-       if ((value = _nc_getenv_num("LINES")) > 0) {
+-           *linep = value;
+-           T(("screen size: environment LINES = %d", *linep));
+-       }
+-       if ((value = _nc_getenv_num("COLUMNS")) > 0) {
+-           *colp = value;
+-           T(("screen size: environment COLUMNS = %d", *colp));
++       if (_nc_prescreen.use_env) {
++           if (_nc_prescreen.use_tioctl) {
++               /*
++                * If environment variables are used, update them.
++                */
++               if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
++                   _nc_setenv_num("LINES", *linep);
++               }
++               if (_nc_getenv_num("COLUMNS") > 0) {
++                   _nc_setenv_num("COLUMNS", *colp);
++               }
++           }
++
++           /*
++            * Finally, look for environment variables.
++            *
++            * Solaris lets users override either dimension with an environment
++            * variable.
++            */
++           if ((value = _nc_getenv_num("LINES")) > 0) {
++               *linep = value;
++               T(("screen size: environment LINES = %d", *linep));
++           }
++           if ((value = _nc_getenv_num("COLUMNS")) > 0) {
++               *colp = value;
++               T(("screen size: environment COLUMNS = %d", *colp));
++           }
+        }
+ 
+        /* if we can't get dynamic info about the size, use static */
+@@ -401,8 +440,11 @@
+      */
+     if (sp != 0
+        && sp->_resize != 0) {
+-       if ((new_lines != old_lines) || (new_cols != old_cols))
++       if ((new_lines != old_lines) || (new_cols != old_cols)) {
+            sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
++       } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
++           sp->_ungetch(SP_PARM, KEY_RESIZE);  /* so application can know this */
++       }
+        sp->_sig_winch = FALSE;
+     }
+ }
+@@ -414,22 +456,6 @@
   *
   ****************************************************************************/
@@ -37172 +52291 @@
  /*
   * Return 1 if entry found, 0 if not found, -1 if database not accessible,
-@@ -467,7 +449,7 @@
+@@ -467,7 +493,7 @@
  **     and substitute it in for the prototype given in 'command_character'.
  */
@@ -37181 +52300 @@
      unsigned i;
      char CC;
-@@ -481,8 +463,8 @@
+@@ -481,8 +507,8 @@
      if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
         CC = *tmp;
@@ -37192 +52311 @@
             }
         }
-@@ -551,7 +533,7 @@
+@@ -551,7 +577,7 @@
      int value;
      int result = 0;
@@ -37201 +52320 @@
      } else if ((value = tigetnum("U8")) >= 0) {
         result = value;         /* use extension feature */
-@@ -578,7 +560,7 @@
+@@ -578,7 +604,7 @@
                  NCURSES_CONST char *tname,
                  int Filedes,
@@ -37210 +52329 @@
  #ifdef USE_TERM_DRIVER
      TERMINAL_CONTROL_BLOCK *TCB = 0;
-@@ -694,11 +676,11 @@
+@@ -684,7 +710,7 @@
+            const TERMTYPE *fallback = _nc_fallback(tname);
+ 
+            if (fallback) {
+-               termp->type = *fallback;
++               _nc_copy_termtype(&(termp->type), fallback);
+                status = TGETENT_YES;
+            }
+        }
+@@ -694,11 +720,11 @@
             if (status == TGETENT_ERR) {
                 ret_error0(status, "terminals database is inaccessible\n");
@@ -37224 +52352 @@
  #endif
  
-@@ -708,7 +690,7 @@
+@@ -708,7 +734,7 @@
         set_curterm(termp);
  
@@ -37233 +52361 @@
         /*
          * If an application calls setupterm() rather than initscr() or
-@@ -742,10 +724,19 @@
+@@ -742,10 +768,19 @@
  
  #ifndef USE_TERM_DRIVER
@@ -37257 +52385 @@
  #endif
      returnCode(code);
-@@ -798,7 +789,7 @@
+@@ -798,7 +833,7 @@
  _nc_setupterm(NCURSES_CONST char *tname,
               int Filedes,
@@ -37267 +52395 @@
      TERMINAL *termp;
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_termcap.c ncurses-5.9/ncurses/tinfo/lib_termcap.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_termcap.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_termcap.c     2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_termcap.c        2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_termcap.c     2012-08-25 19:58:00.916560441 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37281 +52409 @@
  
 -MODULE_ID("$Id: lib_termcap.c,v 1.73 2010/12/25 19:27:12 tom Exp $")
-+MODULE_ID("$Id: lib_termcap.c,v 1.76 2011/10/22 17:12:41 tom Exp $")
++MODULE_ID("$Id: lib_termcap.c,v 1.78 2012/02/22 22:34:31 tom Exp $")
  
  NCURSES_EXPORT_VAR(char *) UP = 0;
@@ -37317 +52445 @@
             if (VALID_STRING(result)) {
                 if (result == exit_attribute_mode
+@@ -361,7 +362,7 @@
+                }
+                if (area != 0
+                    && *area != 0) {
+-                   (void) strcpy(*area, result);
++                   _nc_STRCPY(*area, result, 1024);
+                    result = *area;
+                    *area += strlen(*area) + 1;
+                }
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_tgoto.c ncurses-5.9/ncurses/tinfo/lib_tgoto.c
+--- ncurses-5.9.orig/ncurses/tinfo/lib_tgoto.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_tgoto.c       2012-08-25 19:58:00.916560441 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2000-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 2000-2008,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -35,7 +35,7 @@
+ #include <ctype.h>
+ #include <termcap.h>
+ 
+-MODULE_ID("$Id: lib_tgoto.c,v 1.13 2008/08/16 19:29:32 tom Exp $")
++MODULE_ID("$Id: lib_tgoto.c,v 1.16 2012/02/24 02:08:08 tom Exp $")
+ 
+ #if !PURE_TERMINFO
+ static bool
+@@ -159,7 +159,8 @@
+                break;
+            }
+            if (fmt != 0) {
+-               sprintf(result + used, fmt, *value++);
++               _nc_SPRINTF(result + used, _nc_SLIMIT(length - used)
++                           fmt, *value++);
+                used += strlen(result + used);
+                fmt = 0;
+            }
+@@ -174,7 +175,7 @@
+     }
+     if (result != 0) {
+        if (need_BC) {
+-           strcpy(result + used, BC);
++           _nc_STRCPY(result + used, BC, length - used);
+            used += strlen(BC);
+        }
+        result[used] = '\0';
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_tparm.c ncurses-5.9/ncurses/tinfo/lib_tparm.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_tparm.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_tparm.c       2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_tparm.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_tparm.c       2012-08-25 19:58:00.916560441 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -42,7 +42,7 @@
  #include <ctype.h>
@@ -37325 +52507 @@
  
 -MODULE_ID("$Id: lib_tparm.c,v 1.82 2011/01/15 22:19:12 tom Exp $")
-+MODULE_ID("$Id: lib_tparm.c,v 1.84 2011/10/22 15:48:47 tom Exp $")
++MODULE_ID("$Id: lib_tparm.c,v 1.86 2012/02/22 22:40:24 tom Exp $")
  
  /*
   *     char *
-@@ -153,7 +153,7 @@
+@@ -143,7 +143,9 @@
+ 
+     get_space(s_len + 1);
+ 
+-    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, s);
++    _nc_SPRINTF(TPS(out_buff) + TPS(out_used),
++               _nc_SLIMIT(TPS(out_size) - TPS(out_used))
++               fmt, s);
+     TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
+ }
+ 
+@@ -153,9 +155,11 @@
      if (len < 30)
         len = 30;               /* actually log10(MAX_INT)+1 */
@@ -37336 +52529 @@
 +    get_space((size_t) len + 1);
  
-     (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number);
+-    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number);
++    _nc_SPRINTF(TPS(out_buff) + TPS(out_used),
++               _nc_SLIMIT(TPS(out_size) - TPS(out_used))
++               fmt, number);
      TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
-@@ -164,7 +164,7 @@
+ }
+ 
+@@ -164,7 +168,7 @@
  {
      if (c == 0)
@@ -37347 +52545 @@
  }
  
-@@ -450,7 +450,7 @@
+@@ -450,7 +454,7 @@
  }
  
@@ -37356 +52554 @@
      char *p_is_s[NUM_PARM];
      TPARM_ARG param[NUM_PARM];
-@@ -522,7 +522,7 @@
+@@ -522,7 +526,7 @@
      }
  #ifdef TRACE
@@ -37365 +52563 @@
                 save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
             else
-@@ -757,7 +757,7 @@
+@@ -757,7 +761,7 @@
         cp++;
      }                          /* endwhile (*cp) */
@@ -37375 +52573 @@
      T((T_RETURN("%s"), _nc_visbuf(TPS(out_buff))));
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_tputs.c ncurses-5.9/ncurses/tinfo/lib_tputs.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_tputs.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_tputs.c       2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_tputs.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_tputs.c       2012-08-25 19:58:00.919893759 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37389 +52587 @@
  
 -MODULE_ID("$Id: lib_tputs.c,v 1.81 2010/12/20 00:42:50 tom Exp $")
-+MODULE_ID("$Id: lib_tputs.c,v 1.82 2011/10/22 16:34:50 tom Exp $")
++MODULE_ID("$Id: lib_tputs.c,v 1.84 2012/02/22 22:40:24 tom Exp $")
  
  NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
@@ -37402 +52600 @@
      } else {
         if (putc(ch, NC_OUTPUT(SP_PARM)) == EOF)
+@@ -216,9 +216,9 @@
+ 
+     if (USE_TRACEF(TRACE_TPUTS)) {
+        if (outc == NCURSES_SP_NAME(_nc_outch))
+-           (void) strcpy(addrbuf, "_nc_outch");
++           _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));
+        else
+-           (void) sprintf(addrbuf, "%p", outc);
++           _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc);
+        if (_nc_tputs_trace) {
+            _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
+                    _nc_visbuf(string), affcnt, addrbuf);
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.9/ncurses/tinfo/lib_ttyflags.c
---- ncurses-5.9.orig/ncurses/tinfo/lib_ttyflags.c       2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/lib_ttyflags.c    2012-02-16 18:25:13.211824607 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/lib_ttyflags.c       2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/lib_ttyflags.c    2012-08-25 19:58:00.396562900 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37435 +52645 @@
                     if ((errno == ENOTTY) && (SP_PARM != 0))
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/make_hash.c ncurses-5.9/ncurses/tinfo/make_hash.c
---- ncurses-5.9.orig/ncurses/tinfo/make_hash.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/make_hash.c       2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/make_hash.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/make_hash.c       2012-08-25 19:58:00.919893759 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -39,12 +39,13 @@
- 
- #include <build.priv.h>
- 
-+#include <term_entry.h>
- #include <tic.h>
- #include <hashsize.h>
+@@ -44,7 +44,7 @@
  
  #include <ctype.h>
  
 -MODULE_ID("$Id: make_hash.c,v 1.3 2010/05/22 18:02:50 tom Exp $")
-+MODULE_ID("$Id: make_hash.c,v 1.4 2011/10/08 21:11:54 tom Exp $")
++MODULE_ID("$Id: make_hash.c,v 1.8 2012/02/22 22:40:24 tom Exp $")
  
  /*
   *     _nc_make_hash_table()
+@@ -261,8 +261,8 @@
+               root_name);
+        printf("{\n");
+        for (n = 0; n < CAPTABSIZE; n++) {
+-           sprintf(buffer, "\"%s\"",
+-                   name_table[n].nte_name);
++           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "\"%s\"",
++                       name_table[n].nte_name);
+            printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
+                   buffer,
+                   typenames[name_table[n].nte_type],
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/make_keys.c ncurses-5.9/ncurses/tinfo/make_keys.c
---- ncurses-5.9.orig/ncurses/tinfo/make_keys.c  2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/make_keys.c       2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/make_keys.c  2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/make_keys.c       2012-08-25 19:58:00.043231239 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37488 +52703 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/name_match.c ncurses-5.9/ncurses/tinfo/name_match.c
---- ncurses-5.9.orig/ncurses/tinfo/name_match.c 2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/name_match.c      2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/name_match.c 2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/name_match.c      2012-08-25 19:58:00.043231239 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37563 +52778 @@
  {
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/parse_entry.c ncurses-5.9/ncurses/tinfo/parse_entry.c
---- ncurses-5.9.orig/ncurses/tinfo/parse_entry.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/parse_entry.c     2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/parse_entry.c        2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/parse_entry.c     2012-08-25 19:58:00.919893759 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37577 +52792 @@
  
 -MODULE_ID("$Id: parse_entry.c,v 1.75 2010/05/01 19:35:09 tom Exp $")
-+MODULE_ID("$Id: parse_entry.c,v 1.76 2011/07/27 01:14:47 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.78 2012/02/22 22:40:24 tom Exp $")
  
  #ifdef LINT
@@ -37605 +52820 @@
  
             case STRING:
+@@ -654,14 +660,16 @@
+ 
+        if (WANTED(carriage_return)) {
+            if (carriage_return_delay > 0) {
+-               sprintf(buf, "%s$<%d>", C_CR, carriage_return_delay);
++               _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                           "%s$<%d>", C_CR, carriage_return_delay);
+                carriage_return = _nc_save_str(buf);
+            } else
+                carriage_return = _nc_save_str(C_CR);
+        }
+        if (WANTED(cursor_left)) {
+            if (backspace_delay > 0) {
+-               sprintf(buf, "%s$<%d>", C_BS, backspace_delay);
++               _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                           "%s$<%d>", C_BS, backspace_delay);
+                cursor_left = _nc_save_str(buf);
+            } else if (backspaces_with_bs == 1)
+                cursor_left = _nc_save_str(C_BS);
+@@ -674,7 +682,8 @@
+                cursor_down = linefeed_if_not_lf;
+            else if (linefeed_is_newline != 1) {
+                if (new_line_delay > 0) {
+-                   sprintf(buf, "%s$<%d>", C_LF, new_line_delay);
++                   _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                               "%s$<%d>", C_LF, new_line_delay);
+                    cursor_down = _nc_save_str(buf);
+                } else
+                    cursor_down = _nc_save_str(C_LF);
+@@ -685,7 +694,8 @@
+                cursor_down = linefeed_if_not_lf;
+            else if (linefeed_is_newline != 1) {
+                if (new_line_delay > 0) {
+-                   sprintf(buf, "%s$<%d>", C_LF, new_line_delay);
++                   _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                               "%s$<%d>", C_LF, new_line_delay);
+                    scroll_forward = _nc_save_str(buf);
+                } else
+                    scroll_forward = _nc_save_str(C_LF);
+@@ -694,7 +704,8 @@
+        if (WANTED(newline)) {
+            if (linefeed_is_newline == 1) {
+                if (new_line_delay > 0) {
+-                   sprintf(buf, "%s$<%d>", C_LF, new_line_delay);
++                   _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                               "%s$<%d>", C_LF, new_line_delay);
+                    newline = _nc_save_str(buf);
+                } else
+                    newline = _nc_save_str(C_LF);
+@@ -736,7 +747,8 @@
+         */
+        if (WANTED(tab)) {
+            if (horizontal_tab_delay > 0) {
+-               sprintf(buf, "%s$<%d>", C_HT, horizontal_tab_delay);
++               _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
++                           "%s$<%d>", C_HT, horizontal_tab_delay);
+                tab = _nc_save_str(buf);
+            } else
+                tab = _nc_save_str(C_HT);
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/read_entry.c ncurses-5.9/ncurses/tinfo/read_entry.c
---- ncurses-5.9.orig/ncurses/tinfo/read_entry.c 2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/read_entry.c      2012-02-16 18:25:12.995818907 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/read_entry.c 2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/read_entry.c      2012-08-25 19:58:00.919893759 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -41,7 +41,7 @@
  
@@ -37613 +52894 @@
  
 -MODULE_ID("$Id: read_entry.c,v 1.108 2011/02/26 15:36:06 tom Exp $")
-+MODULE_ID("$Id: read_entry.c,v 1.117 2011/10/22 15:30:24 tom Exp $")
++MODULE_ID("$Id: read_entry.c,v 1.119 2012/02/22 22:40:24 tom Exp $")
  
  #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
@@ -37699 +52980 @@
                 _nc_free_termtype(ptr);
             }
-@@ -390,6 +393,57 @@
+@@ -390,6 +393,58 @@
      return (code);
  }
@@ -37720 +53001 @@
 +       if (size >= lens
 +           && !strcmp(path + size - lens, suffix))
-+           (void) strcpy(filename, path);
++           _nc_STRCPY(filename, path, limit);
 +       else
-+           (void) sprintf(filename, "%s%s", path, suffix);
++           _nc_SPRINTF(filename, _nc_SLIMIT(limit) "%s%s", path, suffix);
 +       result = TRUE;
 +    }
@@ -37747 +53028 @@
 +
 +       if (need <= limit) {
-+           (void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
++           _nc_SPRINTF(filename, _nc_SLIMIT(limit)
++                       "%s/" LEAF_FMT "/%s", path, *name, name);
 +           result = TRUE;
 +       }
@@ -37757 +53039 @@
   * Build a terminfo pathname and try to read the data.  Returns TGETENT_YES on
   * success, TGETENT_NO on failure.
-@@ -401,101 +455,79 @@
+@@ -401,101 +456,80 @@
                    const char *name,
                    TERMTYPE *const tp)
@@ -37915 +53197 @@
 +    else if (code != TGETENT_YES) {
 +       code = _nc_read_termcap_entry(name, tp);
-+       sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
++       _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
++                   "%.*s", PATH_MAX - 1, _nc_get_source());
      }
  #endif
@@ -37923 +53206 @@
  #endif /* USE_DATABASE */
  
-@@ -519,22 +551,23 @@
+@@ -513,31 +547,35 @@
+ {
+     int code = TGETENT_NO;
+ 
+-    sprintf(filename, "%.*s", PATH_MAX - 1, name);
++    _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
++               "%.*s", PATH_MAX - 1, name);
++
+     if (strlen(name) == 0
+        || strcmp(name, ".") == 0
         || strcmp(name, "..") == 0
         || _nc_pathlast(name) != 0
@@ -37951 +53243 @@
         if (code != TGETENT_YES) {
             code = _nc_read_termcap_entry(name, tp);
-            sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
+-           sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
++           _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
++                       "%.*s", PATH_MAX - 1, _nc_get_source());
+        }
+ #endif
+     }
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/read_termcap.c ncurses-5.9/ncurses/tinfo/read_termcap.c
---- ncurses-5.9.orig/ncurses/tinfo/read_termcap.c       2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/read_termcap.c    2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/read_termcap.c       2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/read_termcap.c    2012-08-25 19:58:01.376558266 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37970 +53267 @@
  
 -MODULE_ID("$Id: read_termcap.c,v 1.74 2010/01/23 17:57:43 tom Exp $")
-+MODULE_ID("$Id: read_termcap.c,v 1.84 2011/09/26 22:52:50 tom Exp $")
++MODULE_ID("$Id: read_termcap.c,v 1.87 2012/05/05 19:40:50 tom Exp $")
  
  #if !PURE_TERMINFO
@@ -37983 +53280 @@
  }
  
+@@ -162,7 +161,7 @@
+        return (-1);
+     }
+     gottoprec = 0;
+-    (void) strcpy(toprec, ent);
++    _nc_STRCPY(toprec, ent, topreclen);
+     return (0);
+ }
+ 
+@@ -295,7 +294,7 @@
+            errno = ENOMEM;
+            return (TC_SYS_ERR);
+        }
+-       (void) strcpy(record, toprec);
++       _nc_STRCPY(record, toprec, topreclen + BFRAG);
+        rp = record + topreclen + 1;
+        r_end = rp + BFRAG;
+        current = in_array;
 @@ -384,7 +383,14 @@
                         c = *bp++;
@@ -38099 +53414 @@
      cp = use_terminfo_vars()? getenv("TERMCAP") : NULL;
  
-@@ -841,6 +851,9 @@
+@@ -812,10 +822,11 @@
+            if ((home = getenv("HOME")) != 0 && *home != '\0'
+                && strchr(home, ' ') == 0
+                && strlen(home) < sizeof(temp) - 10) {  /* setup path */
+-               sprintf(temp, "%s/", home);     /* $HOME first */
++               _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
++                           "%s/", home);       /* $HOME first */
+            }
+            /* if no $HOME look in current directory */
+-           strcat(temp, ".termcap");
++           _nc_STRCAT(temp, ".termcap", sizeof(temp));
+            _nc_safe_strcat(&desc, temp);
+            _nc_safe_strcat(&desc, " ");
+            _nc_safe_strcat(&desc, get_termpath());
+@@ -841,6 +852,9 @@
         }
      }
@@ -38109 +53438 @@
         if (_nc_cgetset(cp) < 0) {
             return (TC_SYS_ERR);
-@@ -853,6 +866,7 @@
+@@ -853,6 +867,7 @@
       * empty fields, and mistakenly use the last valid cap entry instead of
       * the first (breaks tc= includes)
@@ -38117 +53446 @@
         char *pd, *ps, *tok;
         int endflag = FALSE;
-@@ -932,7 +946,7 @@
+@@ -932,7 +947,7 @@
      if (count < MAXPATHS
         && _nc_access(path, R_OK) == 0) {
@@ -38126 +53455 @@
      termpaths[count] = 0;
      if (save != 0)
-@@ -956,13 +970,13 @@
+@@ -956,13 +971,13 @@
      static char *source;
      static int lineno;
@@ -38142 +53471 @@
      }
  
-@@ -980,7 +994,7 @@
+@@ -980,7 +995,7 @@
         _nc_curr_line = lineno;
         _nc_set_source(source);
@@ -38151 +53480 @@
      /*
       * Here is what the 4.4BSD termcap(3) page prescribes:
-@@ -1063,7 +1077,7 @@
+@@ -1027,7 +1042,9 @@
+            normal = FALSE;
+        } else if (_nc_name_match(tc, tn, "|:")) {      /* treat as a capability file */
+            use_buffer = TRUE;
+-           (void) sprintf(tc_buf, "%.*s\n", (int) sizeof(tc_buf) - 2, tc);
++           _nc_SPRINTF(tc_buf,
++                       _nc_SLIMIT(sizeof(tc_buf))
++                       "%.*s\n", (int) sizeof(tc_buf) - 2, tc);
+            normal = FALSE;
+        }
+     }
+@@ -1049,8 +1066,9 @@
+        if (use_terminfo_vars() && (h = getenv("HOME")) != NULL && *h != '\0'
+            && (strlen(h) + sizeof(PRIVATE_CAP)) < PATH_MAX) {
+            /* user's .termcap, if any, should override it */
+-           (void) strcpy(envhome, h);
+-           (void) sprintf(pathbuf, PRIVATE_CAP, envhome);
++           _nc_STRCPY(envhome, h, sizeof(envhome));
++           _nc_SPRINTF(pathbuf, _nc_SLIMIT(sizeof(pathbuf))
++                       PRIVATE_CAP, envhome);
+            ADD_TC(pathbuf, filecount);
+        }
+     }
+@@ -1063,7 +1081,7 @@
      for (j = 0; j < filecount; j++) {
         bool omit = FALSE;
@@ -38160 +53512 @@
         } else {
             for (k = 0; k < j; k++) {
-@@ -1075,7 +1089,7 @@
+@@ -1075,7 +1093,7 @@
             }
         }
@@ -38169 +53521 @@
                 termpaths[k - 1] = termpaths[k];
                 test_stat[k - 1] = test_stat[k];
-@@ -1100,7 +1114,7 @@
+@@ -1100,7 +1118,7 @@
  
         for (i = 0; i < filecount; i++) {
@@ -38178 +53530 @@
                 && (fp = fopen(termpaths[i], "r")) != (FILE *) 0) {
                 _nc_set_source(termpaths[i]);
+@@ -1138,8 +1156,7 @@
+                 * from the list.
+                 */
+                *tp = ep->tterm;
+-               _nc_delink_entry(_nc_head, &(ep->tterm));
+-               free(ep);
++               _nc_free_entry(_nc_head, &(ep->tterm));
+ 
+                /*
+                 * OK, now try to write the type to user's terminfo directory. 
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/setbuf.c ncurses-5.9/ncurses/tinfo/setbuf.c
---- ncurses-5.9.orig/ncurses/tinfo/setbuf.c     2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/setbuf.c  2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/setbuf.c     2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/setbuf.c  2012-08-25 19:58:00.046564556 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38224 +53586 @@
      NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered);
  }
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/strings.c ncurses-5.9/ncurses/tinfo/strings.c
+--- ncurses-5.9.orig/ncurses/tinfo/strings.c    2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/strings.c 2012-08-25 19:58:00.919893759 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2000-2003,2007 Free Software Foundation, Inc.              *
++ * Copyright (c) 2000-2007,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,7 +36,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: strings.c,v 1.6 2007/08/11 17:12:17 tom Exp $")
++MODULE_ID("$Id: strings.c,v 1.8 2012/02/22 22:34:31 tom Exp $")
+ 
+ /****************************************************************************
+  * Useful string functions (especially for mvcur)
+@@ -110,7 +110,7 @@
+ 
+        if (len < dst->s_size) {
+            if (dst->s_tail != 0) {
+-               strcpy(dst->s_tail, src);
++               _nc_STRCPY(dst->s_tail, src, dst->s_size);
+                dst->s_tail += len;
+            }
+            dst->s_size -= len;
+@@ -131,7 +131,7 @@
+ 
+        if (len < dst->s_size) {
+            if (dst->s_head != 0) {
+-               strcpy(dst->s_head, src);
++               _nc_STRCPY(dst->s_head, src, dst->s_size);
+                dst->s_tail = dst->s_head + len;
+            }
+            dst->s_size = dst->s_init - len;
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/tinfo_driver.c ncurses-5.9/ncurses/tinfo/tinfo_driver.c
---- ncurses-5.9.orig/ncurses/tinfo/tinfo_driver.c       2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/tinfo_driver.c    2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/tinfo_driver.c       2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/tinfo_driver.c    2012-08-25 19:58:02.069888321 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38239 +53638 @@
  
 -MODULE_ID("$Id: tinfo_driver.c,v 1.13 2010/12/20 01:47:09 tom Exp $")
-+MODULE_ID("$Id: tinfo_driver.c,v 1.17 2011/12/17 20:40:33 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.24 2012/07/28 20:12:11 tom Exp $")
  
  /*
   * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -93,7 +93,7 @@
+ 
+ #define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO)
+ #define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC)
+-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp
++#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp
+ 
+ /*
+  * This routine needs to do all the work to make curscr look
 @@ -106,22 +106,6 @@
      return TINFO_DOUPDATE(TCB->csp);
@@ -38321 +53729 @@
              NCURSES_SP_OUTC outc)
  {
-@@ -463,7 +457,7 @@
+@@ -348,14 +342,18 @@
+ {
+     SCREEN *sp;
+     bool useEnv = TRUE;
++    bool useTioctl = TRUE;
+ 
+     AssertTCB();
+     sp = TCB->csp;             /* can be null here */
+ 
+     if (sp) {
+        useEnv = sp->_use_env;
+-    } else
++       useTioctl = sp->_use_tioctl;
++    } else {
+        useEnv = _nc_prescreen.use_env;
++       useTioctl = _nc_prescreen.use_tioctl;
++    }
+ 
+     /* figure out the size of the screen */
+     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
+@@ -363,7 +361,7 @@
+     *linep = (int) lines;
+     *colp = (int) columns;
+ 
+-    if (useEnv) {
++    if (useEnv || useTioctl) {
+        int value;
+ 
+ #ifdef __EMX__
+@@ -371,7 +369,9 @@
+            int screendata[2];
+            _scrsize(screendata);
+            *colp = screendata[0];
+-           *linep = screendata[1];
++           *linep = ((sp != 0 && sp->_filtered)
++                     ? 1
++                     : screendata[1]);
+            T(("EMX screen size: environment LINES = %d COLUMNS = %d",
+               *linep, *colp));
+        }
+@@ -400,19 +400,33 @@
+        }
+ #endif /* HAVE_SIZECHANGE */
+ 
+-       /*
+-        * Finally, look for environment variables.
+-        *
+-        * Solaris lets users override either dimension with an environment
+-        * variable.
+-        */
+-       if ((value = _nc_getenv_num("LINES")) > 0) {
+-           *linep = value;
+-           T(("screen size: environment LINES = %d", *linep));
+-       }
+-       if ((value = _nc_getenv_num("COLUMNS")) > 0) {
+-           *colp = value;
+-           T(("screen size: environment COLUMNS = %d", *colp));
++       if (useEnv) {
++           if (useTioctl) {
++               /*
++                * If environment variables are used, update them.
++                */
++               if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
++                   _nc_setenv_num("LINES", *linep);
++               }
++               if (_nc_getenv_num("COLUMNS") > 0) {
++                   _nc_setenv_num("COLUMNS", *colp);
++               }
++           }
++
++           /*
++            * Finally, look for environment variables.
++            *
++            * Solaris lets users override either dimension with an environment
++            * variable.
++            */
++           if ((value = _nc_getenv_num("LINES")) > 0) {
++               *linep = value;
++               T(("screen size: environment LINES = %d", *linep));
++           }
++           if ((value = _nc_getenv_num("COLUMNS")) > 0) {
++               *colp = value;
++               T(("screen size: environment COLUMNS = %d", *colp));
++           }
+        }
+ 
+        /* if we can't get dynamic info about the size, use static */
+@@ -463,7 +477,7 @@
  }
  
@@ -38330 +53825 @@
      SCREEN *sp = TCB->csp;
      TERMINAL *_term = (TERMINAL *) TCB;
-@@ -497,7 +491,7 @@
+@@ -497,7 +511,7 @@
  }
  
@@ -38339 +53834 @@
      SCREEN *sp;
      TERMINAL *_term = (TERMINAL *) TCB;
-@@ -628,7 +622,7 @@
+@@ -620,15 +634,13 @@
+ static void
+ drv_init(TERMINAL_CONTROL_BLOCK * TCB)
+ {
+-    SCREEN *sp;
+     TERMINAL *trm;
+ 
+     AssertTCB();
+ 
      trm = (TERMINAL *) TCB;
-     sp = TCB->csp;
+-    sp = TCB->csp;
  
 -    TCB->info.initcolor = initialize_color;
@@ -38348 +53851 @@
      TCB->info.hascolor = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
                            && (((set_foreground != NULL)
-@@ -665,7 +659,7 @@
+@@ -665,7 +677,7 @@
  #define InPalette(n)   ((n) >= 0 && (n) < MAX_PALETTE)
  
@@ -38357 +53860 @@
      SCREEN *sp;
  
-@@ -712,7 +706,7 @@
+@@ -712,7 +724,7 @@
  
  static void
@@ -38366 +53869 @@
      SCREEN *sp = TCB->csp;
  
-@@ -726,9 +720,9 @@
+@@ -726,9 +738,9 @@
  
  static void
@@ -38379 +53882 @@
  {
      SCREEN *sp = TCB->csp;
-@@ -845,7 +839,9 @@
+@@ -759,7 +771,7 @@
+     if (old_pair >= 0
+        && sp != 0
+        && NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx
+-                                         old_pair,
++                                         (short) old_pair,
+                                          &old_fg,
+                                          &old_bg) !=ERR) {
+        if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
+@@ -845,7 +857,9 @@
  }
  
@@ -38390 +53902 @@
      int rc = 0;
      SCREEN *sp;
-@@ -899,7 +895,7 @@
+@@ -899,7 +913,7 @@
  }
  
@@ -38399 +53911 @@
      SCREEN *sp = TCB->csp;
  
-@@ -1176,7 +1172,7 @@
+@@ -1176,7 +1190,7 @@
      if ((pthread_self) && (pthread_kill) && (pthread_equal))
         _nc_globals.read_thread = pthread_self();
@@ -38408 +53920 @@
      _nc_globals.read_thread = 0;
  #endif
-@@ -1225,7 +1221,7 @@
+@@ -1225,7 +1239,7 @@
  }
  
@@ -38417 +53929 @@
      int ret = ERR;
      SCREEN *sp;
-@@ -1251,7 +1247,7 @@
+@@ -1251,7 +1265,7 @@
  }
  
@@ -38426 +53938 @@
      SCREEN *sp;
      int code = ERR;
-@@ -1264,7 +1260,8 @@
+@@ -1264,7 +1278,8 @@
      if (c >= 0) {
         unsigned ch = (unsigned) c;
@@ -38436 +53948 @@
                 code = _nc_add_to_try(&(sp->_keytry), s, ch);
                 free(s);
-@@ -1273,7 +1270,8 @@
+@@ -1273,7 +1288,8 @@
                     break;
             }
@@ -38446 +53958 @@
                 code = _nc_add_to_try(&(sp->_key_ok), s, ch);
                 free(s);
+diff -Naur ncurses-5.9.orig/ncurses/tinfo/trim_sgr0.c ncurses-5.9/ncurses/tinfo/trim_sgr0.c
+--- ncurses-5.9.orig/ncurses/tinfo/trim_sgr0.c  2012-08-25 19:57:59.413234218 +0000
++++ ncurses-5.9/ncurses/tinfo/trim_sgr0.c       2012-08-25 19:58:00.923227077 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2005-2007,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2005-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,7 +36,7 @@
+ 
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: trim_sgr0.c,v 1.12 2010/12/25 23:03:57 tom Exp $")
++MODULE_ID("$Id: trim_sgr0.c,v 1.14 2012/02/22 22:34:31 tom Exp $")
+ 
+ #undef CUR
+ #define CUR tp->
+@@ -108,7 +108,7 @@
+                for (n = 0; n < len_s - len_a; ++n) {
+                    s[n] = s[n + len_a];
+                }
+-               strcpy(s + n, attr);
++               _nc_STRCPY(s + n, attr, strlen(s) + 1);
+                TR(TRACE_DATABASE, ("to:\n\t%s", s));
+            }
+        }
 diff -Naur ncurses-5.9.orig/ncurses/tinfo/write_entry.c ncurses-5.9/ncurses/tinfo/write_entry.c
---- ncurses-5.9.orig/ncurses/tinfo/write_entry.c        2012-02-16 18:25:12.675810462 +0000
-+++ ncurses-5.9/ncurses/tinfo/write_entry.c     2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/tinfo/write_entry.c        2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/tinfo/write_entry.c     2012-08-25 19:58:01.729889930 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38475 +54015 @@
  
 -MODULE_ID("$Id: write_entry.c,v 1.78 2010/12/25 23:23:08 tom Exp $")
-+MODULE_ID("$Id: write_entry.c,v 1.82 2011/10/30 14:33:13 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.86 2012/06/16 16:59:05 tom Exp $")
  
  static int total_written;
@@ -38488 +54028 @@
      }
  
-@@ -115,7 +109,7 @@
+@@ -105,7 +99,7 @@
+     if (verified[s - dirnames])
+        return;
+ 
+-    sprintf(dir, LEAF_FMT, code);
++    _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
+     if (make_db_root(dir) < 0) {
+        _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
+     }
+@@ -115,36 +109,35 @@
  #endif /* !USE_HASHED_DB */
  
@@ -38497 +54046 @@
      int rc = -1;
      const char *top = _nc_tic_dir(0);
-@@ -133,18 +127,17 @@
+ 
+     if (src == top || _nc_is_abs_path(src)) {
+        if (strlen(src) + 1 <= limit) {
+-           (void) strcpy(dst, src);
++           _nc_STRCPY(dst, src, limit);
+            rc = 0;
+        }
+     } else {
+        if (strlen(top) + strlen(src) + 2 <= limit) {
+-           (void) sprintf(dst, "%s/%s", top, src);
++           _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);
+            rc = 0;
+        }
      }
  #if USE_HASHED_DB
@@ -38517 +54078 @@
 +       if (have > need && strcmp(dst + (int) (have - need), suffix)) {
 +           if (have + need <= limit) {
-+               strcat(dst, suffix);
++               _nc_STRCAT(dst, suffix, limit);
 +           } else {
 +               rc = -1;
@@ -38540 +54101 @@
         struct stat statbuf;
  
-@@ -355,7 +349,6 @@
+@@ -283,7 +277,7 @@
+     assert(strlen(tp->term_names) != 0);
+     assert(strlen(tp->term_names) < sizeof(name_list));
+ 
+-    (void) strcpy(name_list, tp->term_names);
++    _nc_STRCPY(name_list, tp->term_names, sizeof(name_list));
+     DEBUG(7, ("Name list = '%s'", name_list));
+ 
+     first_name = name_list;
+@@ -336,7 +330,9 @@
+            key.data = name_list;
+            key.size = strlen(name_list);
+ 
+-           strcpy(buffer + 1, tp->term_names);
++           _nc_STRCPY(buffer + 1,
++                      tp->term_names,
++                      sizeof(buffer) - 1);
+            data.size = strlen(tp->term_names) + 1;
+ 
+            _nc_db_put(capdb, &key, &data);
+@@ -355,7 +351,6 @@
  
                 _nc_db_put(capdb, &key, &data);
@@ -38548 +54129 @@
      }
  #else /* !USE_HASHED_DB */
-@@ -491,7 +484,7 @@
+@@ -366,7 +361,8 @@
+     if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))
+        _nc_warning("terminal name too long.");
+ 
+-    sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name);
++    _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))
++               LEAF_FMT "/%s", first_name[0], first_name);
+ 
+     /*
+      * Has this primary name been written since the first call to
+@@ -376,7 +372,22 @@
+     if (start_time > 0 &&
+        stat(filename, &statbuf) >= 0
+        && statbuf.st_mtime >= start_time) {
++#if HAVE_LINK && !USE_SYMLINKS
++       /*
++        * If the file has more than one link, the reason for the previous
++        * write could be that the current primary name used to be an alias for
++        * the previous entry.  In that case, unlink the file so that we will
++        * not modify the previous entry as we write this one.
++        */
++       if (statbuf.st_nlink > 1) {
++           _nc_warning("name redefined.");
++           unlink(filename);
++       } else {
++           _nc_warning("name multiply defined.");
++       }
++#else
+        _nc_warning("name multiply defined.");
++#endif
+     }
+ 
+     check_writeable(first_name[0]);
+@@ -407,7 +418,8 @@
+        }
+ 
+        check_writeable(ptr[0]);
+-       sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr);
++       _nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
++                   LEAF_FMT "/%s", ptr[0], ptr);
+ 
+        if (strcmp(filename, linkname) == 0) {
+            _nc_warning("self-synonym ignored");
+@@ -422,7 +434,7 @@
+            if (first_name[0] == linkname[0])
+                strncpy(symlinkname, first_name, sizeof(symlinkname) - 1);
+            else {
+-               strcpy(symlinkname, "../");
++               _nc_STRCPY(symlinkname, "../", sizeof(suymlinkname));
+                strncat(symlinkname, filename, sizeof(symlinkname) - 4);
+            }
+            symlinkname[sizeof(symlinkname) - 1] = '\0';
+@@ -491,7 +503,7 @@
      return (want / size);
  }
@@ -38557 +54190 @@
  #undef LITTLE_ENDIAN           /* BSD/OS defines this as a feature macro */
  #define HI(x)                  ((x) / 256)
-@@ -706,7 +699,7 @@
+@@ -706,7 +718,7 @@
             return (ERR);
  
@@ -38566 +54199 @@
         TRACE_OUT(("after extended string capabilities, nextfree=%d", nextfree));
  
-@@ -714,7 +707,7 @@
+@@ -714,7 +726,7 @@
             return (ERR);
  
@@ -38575 +54208 @@
         TRACE_OUT(("after extended capnames, nextfree=%d", nextfree));
         strmax = tp->ext_Strings + extcnt;
-@@ -742,7 +735,7 @@
+@@ -742,7 +754,7 @@
  
         TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset));
@@ -38585 +54218 @@
         }
 diff -Naur ncurses-5.9.orig/ncurses/trace/lib_trace.c ncurses-5.9/ncurses/trace/lib_trace.c
---- ncurses-5.9.orig/ncurses/trace/lib_trace.c  2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/ncurses/trace/lib_trace.c       2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/trace/lib_trace.c  2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/lib_trace.c       2012-08-25 19:58:01.316558550 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38599 +54232 @@
  
 -MODULE_ID("$Id: lib_trace.c,v 1.76 2010/12/19 01:21:19 tom Exp $")
-+MODULE_ID("$Id: lib_trace.c,v 1.78 2011/12/17 18:41:48 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.81 2012/04/29 00:20:43 tom Exp $")
  
  NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -103,9 +103,9 @@
+            }
+            TracePath[size] = '\0';
+            assert(strlen(TracePath) <= size);
+-           strcat(TracePath, "/trace");
++           _nc_STRCAT(TracePath, "/trace", sizeof(TracePath));
+            if (_nc_is_dir_path(TracePath)) {
+-               strcat(TracePath, ".log");
++               _nc_STRCAT(TracePath, ".log", sizeof(TracePath));
+            }
+        }
  
 @@ -121,7 +121,7 @@
@@ -38633 +54278 @@
      T((T_RETURN("%s"), code ? "TRUE" : "FALSE"));
      return code;
-@@ -226,7 +226,7 @@
+@@ -226,10 +226,10 @@
  
  /* Trace 'char' return-values */
@@ -38641 +54286 @@
  {
      T((T_RETURN("%c"), code));
-     return code;
+-    return code;
++    return (char) code;
+ }
+ 
+ /* Trace 'int' return-values */
 diff -Naur ncurses-5.9.orig/ncurses/trace/lib_traceatr.c ncurses-5.9/ncurses/trace/lib_traceatr.c
---- ncurses-5.9.orig/ncurses/trace/lib_traceatr.c       2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/ncurses/trace/lib_traceatr.c    2012-02-16 18:25:12.999819013 +0000
-@@ -43,7 +43,7 @@
+--- ncurses-5.9.orig/ncurses/trace/lib_traceatr.c       2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/lib_traceatr.c    2012-08-25 19:58:00.923227077 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -43,10 +43,13 @@
  #define CUR SP_TERMTYPE
  #endif
  
 -MODULE_ID("$Id: lib_traceatr.c,v 1.74 2011/01/22 19:48:01 tom Exp $")
-+MODULE_ID("$Id: lib_traceatr.c,v 1.76 2011/10/22 15:39:21 tom Exp $")
++MODULE_ID("$Id: lib_traceatr.c,v 1.79 2012/02/22 22:40:24 tom Exp $")
  
  #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
  
-@@ -120,7 +120,7 @@
++#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size)
++#define COLOR_BUF_SIZE(num) (sizeof(my_buffer[num]))
++
+ #ifdef TRACE
+ 
+ static const char l_brace[] = StringOf(L_BRACE);
+@@ -65,9 +68,12 @@
+        my_cached = c;
+        my_select = !my_select;
+        if (c == COLOR_DEFAULT)
+-           strcpy(my_buffer[my_select], "default");
++           _nc_STRCPY(my_buffer[my_select], "default",
++                      COLOR_BUF_SIZE(my_select));
+        else
+-           sprintf(my_buffer[my_select], "color%d", c);
++           _nc_SPRINTF(my_buffer[my_select],
++                       _nc_SLIMIT(COLOR_BUF_SIZE(my_select))
++                       "color%d", c);
+     }
+     return my_buffer[my_select];
+ }
+@@ -120,14 +126,14 @@
      ;
      size_t n;
@@ -38663 +54340 @@
      if (result != 0) {
         unsigned save_nc_tracing = _nc_tracing;
-@@ -243,7 +243,7 @@
+ 
+        _nc_tracing = 0;
+ 
+-       strcpy(result, l_brace);
++       _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
+ 
+        for (n = 0; n < SIZEOF(names); n++) {
+            if ((newmode & names[n].val) != 0) {
+@@ -139,18 +145,20 @@
+                    short pairnum = (short) PairNumber(newmode);
+ #ifdef USE_TERMLIB
+                    /* pair_content lives in libncurses */
+-                   (void) sprintf(temp, "{%d}", pairnum);
++                   _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
++                               "{%d}", pairnum);
+ #else
+                    short fg, bg;
+ 
+                    if (pair_content(pairnum, &fg, &bg) == OK) {
+-                       (void) sprintf(temp,
+-                                      "{%d = {%s, %s}}",
+-                                      pairnum,
+-                                      COLOR_OF(fg),
+-                                      COLOR_OF(bg));
++                       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
++                                   "{%d = {%s, %s}}",
++                                   pairnum,
++                                   COLOR_OF(fg),
++                                   COLOR_OF(bg));
+                    } else {
+-                       (void) sprintf(temp, "{%d}", pairnum);
++                       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
++                                   "{%d}", pairnum);
+                    }
+ #endif
+                    result = _nc_trace_bufcat(bufnum, temp);
+@@ -243,7 +251,7 @@
  #if NCURSES_SP_FUNCS
      (void) sp;
@@ -38672 +54385 @@
         char *found = 0;
         const ALT_NAMES *strp;
-@@ -271,7 +271,7 @@
+@@ -271,10 +279,10 @@
  _tracechtype2(int bufnum, chtype ch)
  {
@@ -38680 +54393 @@
  
      if (result != 0) {
-        strcpy(result, l_brace);
-@@ -311,7 +311,7 @@
+-       strcpy(result, l_brace);
++       _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
+        if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
+            (void) _nc_trace_bufcat(bufnum, found);
+        } else
+@@ -311,12 +319,12 @@
  NCURSES_EXPORT(char *)
  _tracecchar_t2(int bufnum, const cchar_t *ch)
@@ -38690 +54407 @@
      const char *found;
  
+     if (result != 0) {
+-       strcpy(result, l_brace);
++       _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
+        if (ch != 0) {
+            attr = AttrOfD(ch);
+            if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
 diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracebits.c ncurses-5.9/ncurses/trace/lib_tracebits.c
---- ncurses-5.9.orig/ncurses/trace/lib_tracebits.c      2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/ncurses/trace/lib_tracebits.c   2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/trace/lib_tracebits.c      2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/lib_tracebits.c   2012-08-25 19:58:01.729889930 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -34,11 +34,7 @@
  
@@ -38702 +54432 @@
 -#define _POSIX_SOURCE
 -#endif
-+MODULE_ID("$Id: lib_tracebits.c,v 1.20 2011/04/16 15:32:45 tom Exp $")
++MODULE_ID("$Id: lib_tracebits.c,v 1.23 2012/06/09 19:55:46 tom Exp $")
  
  #if HAVE_SYS_TERMIO_H
  #include <sys/termio.h>                /* needed for ISC */
+@@ -80,22 +76,24 @@
+     const char *name;
+ } BITNAMES;
+ 
++#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size)
++
+ static void
+ lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val)
+ {
+     const BITNAMES *sp;
+ 
+-    (void) strcat(buf, label);
+-    (void) strcat(buf, ": {");
++    _nc_STRCAT(buf, label, TRACE_BUF_SIZE(0));
++    _nc_STRCAT(buf, ": {", TRACE_BUF_SIZE(0));
+     for (sp = table; sp->name; sp++)
+        if (sp->val != 0
+            && (val & sp->val) == sp->val) {
+-           (void) strcat(buf, sp->name);
+-           (void) strcat(buf, ", ");
++           _nc_STRCAT(buf, sp->name, TRACE_BUF_SIZE(0));
++           _nc_STRCAT(buf, ", ", TRACE_BUF_SIZE(0));
+        }
+     if (buf[strlen(buf) - 2] == ',')
+        buf[strlen(buf) - 2] = '\0';
+-    (void) strcat(buf, "} ");
++    _nc_STRCAT(buf, "} ", TRACE_BUF_SIZE(0));
+ }
+ 
+ NCURSES_EXPORT(char *)
+@@ -192,7 +190,7 @@
+                    CS_DATA(CS8),
+            };
+            const char *result = "CSIZE? ";
+-           int value = (tty->c_cflag & CSIZE);
++           int value = (int) (tty->c_cflag & CSIZE);
+            unsigned n;
+ 
+            if (value != 0) {
+@@ -203,7 +201,7 @@
+                    }
+                }
+            }
+-           strcat(buf, result);
++           _nc_STRCAT(buf, result, TRACE_BUF_SIZE(0));
+        }
+ #endif
+ 
+diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracechr.c ncurses-5.9/ncurses/trace/lib_tracechr.c
+--- ncurses-5.9.orig/ncurses/trace/lib_tracechr.c       2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/lib_tracechr.c    2012-08-25 19:58:00.923227077 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -39,10 +39,12 @@
+ 
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: lib_tracechr.c,v 1.20 2009/04/18 22:48:29 tom Exp $")
++MODULE_ID("$Id: lib_tracechr.c,v 1.22 2012/02/22 22:40:24 tom Exp $")
+ 
+ #ifdef TRACE
+ 
++#define MyBufSize sizeof(_nc_globals.tracechr_buf)
++
+ NCURSES_EXPORT(char *)
+ _nc_tracechar(SCREEN *sp, int ch)
+ {
+@@ -55,19 +57,22 @@
+        name = safe_keyname(SP_PARM, ch);
+        if (name == 0 || *name == '\0')
+            name = "NULL";
+-       (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
++       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
++                   "'%.30s' = %#03o", name, ch);
+     } else if (!is8bits(ch) || !isprint(UChar(ch))) {
+        /*
+         * workaround for glibc bug:
+         * sprintf changes the result from unctrl() to an empty string if it
+         * does not correspond to a valid multibyte sequence.
+         */
+-       (void) sprintf(MyBuffer, "%#03o", ch);
++       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
++                   "%#03o", ch);
+     } else {
+        name = safe_unctrl(SP_PARM, (chtype) ch);
+        if (name == 0 || *name == 0)
+            name = "null";      /* shouldn't happen */
+-       (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
++       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
++                   "'%.30s' = %#03o", name, ch);
+     }
+     return (MyBuffer);
+ }
+diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracedmp.c ncurses-5.9/ncurses/trace/lib_tracedmp.c
+--- ncurses-5.9.orig/ncurses/trace/lib_tracedmp.c       2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/lib_tracedmp.c    2012-08-25 19:58:01.733223247 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -39,7 +39,7 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: lib_tracedmp.c,v 1.32 2009/04/18 21:01:38 tom Exp $")
++MODULE_ID("$Id: lib_tracedmp.c,v 1.33 2012/06/09 20:29:33 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -111,7 +111,7 @@
+            if (multicolumn) {
+                ep = my_buffer;
+                for (j = 0; j < width; ++j) {
+-                   chtype test = WidecExt(win->_line[n].text[j]);
++                   int test = WidecExt(win->_line[n].text[j]);
+                    if (test) {
+                        ep[j] = (char) (test + '0');
+                    } else {
+diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracemse.c ncurses-5.9/ncurses/trace/lib_tracemse.c
+--- ncurses-5.9.orig/ncurses/trace/lib_tracemse.c       2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/lib_tracemse.c    2012-08-25 19:58:00.923227077 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -38,7 +38,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_tracemse.c,v 1.18 2011/01/22 19:48:08 tom Exp $")
++MODULE_ID("$Id: lib_tracemse.c,v 1.20 2012/02/22 22:40:24 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -47,7 +47,11 @@
+ static char *
+ _trace_mmask_t(SCREEN *sp, mmask_t code)
+ {
+-#define SHOW(m, s) if ((code & m) == m) strcat(strcat(my_buffer, s), ", ")
++#define SHOW(m, s) \
++    if ((code & m) == m) { \
++       _nc_STRCAT(my_buffer, s, sizeof(my_buffer)); \
++       _nc_STRCAT(my_buffer, ", ", sizeof(my_buffer)); \
++    }
+ 
+     SHOW(BUTTON1_RELEASED, "release-1");
+     SHOW(BUTTON1_PRESSED, "press-1");
+@@ -110,15 +114,16 @@
+ NCURSES_EXPORT(char *)
+ _nc_tracemouse(SCREEN *sp, MEVENT const *ep)
+ {
+-    (void) sprintf(my_buffer, TRACEMSE_FMT,
+-                  ep->id,
+-                  ep->x,
+-                  ep->y,
+-                  ep->z,
+-                  (unsigned long) ep->bstate);
++    _nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer))
++               TRACEMSE_FMT,
++               ep->id,
++               ep->x,
++               ep->y,
++               ep->z,
++               (unsigned long) ep->bstate);
+ 
+     (void) _trace_mmask_t(sp, ep->bstate);
+-    (void) strcat(my_buffer, "}");
++    _nc_STRCAT(my_buffer, "}", sizeof(my_buffer));
+     return (my_buffer);
+ }
+ 
 diff -Naur ncurses-5.9.orig/ncurses/trace/trace_buf.c ncurses-5.9/ncurses/trace/trace_buf.c
---- ncurses-5.9.orig/ncurses/trace/trace_buf.c  2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/ncurses/trace/trace_buf.c       2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/trace/trace_buf.c  2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/trace_buf.c       2012-08-25 19:58:00.923227077 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -35,7 +35,7 @@
  
@@ -38714 +54633 @@
  
 -MODULE_ID("$Id: trace_buf.c,v 1.17 2011/01/22 19:48:16 tom Exp $")
-+MODULE_ID("$Id: trace_buf.c,v 1.18 2011/10/22 15:46:06 tom Exp $")
++MODULE_ID("$Id: trace_buf.c,v 1.20 2012/02/22 22:34:31 tom Exp $")
  
  #ifdef TRACE
  
-@@ -103,7 +103,7 @@
+@@ -103,13 +103,14 @@
  NCURSES_EXPORT(char *)
  _nc_trace_bufcat(int bufnum, const char *value)
@@ -38726 +54645 @@
      if (buffer != 0) {
         size_t have = strlen(buffer);
- 
++       size_t need = strlen(value) + have;
+ 
+-       buffer = _nc_trace_alloc(bufnum, 1 + have + strlen(value));
++       buffer = _nc_trace_alloc(bufnum, 1 + need);
+        if (buffer != 0)
+-           (void) strcpy(buffer + have, value);
++           _nc_STRCPY(buffer + have, value, need);
+ 
+     }
+     return buffer;
+diff -Naur ncurses-5.9.orig/ncurses/trace/varargs.c ncurses-5.9/ncurses/trace/varargs.c
+--- ncurses-5.9.orig/ncurses/trace/varargs.c    2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/varargs.c 2012-08-25 19:58:00.923227077 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 2001-2008,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,7 +34,7 @@
+ 
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $")
++MODULE_ID("$Id: varargs.c,v 1.10 2012/02/22 22:40:24 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -149,25 +149,30 @@
+                        param = buffer;
+                        switch (used) {
+                        case atInteger:
+-                           sprintf(buffer, "%d", ival);
++                           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                                       "%d", ival);
+                            break;
+                        case atFloat:
+-                           sprintf(buffer, "%f", fval);
++                           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                                       "%f", fval);
+                            break;
+                        case atPoint:
+-                           sprintf(buffer, "%p", pval);
++                           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                                       "%p", pval);
+                            break;
+                        case atString:
+                            param = _nc_visbuf2(1, sval);
+                            break;
+                        case atUnknown:
+                        default:
+-                           strcpy(buffer, "?");
++                           _nc_STRCPY(buffer, "?", sizeof(buffer));
+                            break;
+                        }
+                        MyLength += strlen(param) + 2;
+                        MyBuffer = typeRealloc(char, MyLength, MyBuffer);
+-                       sprintf(MyBuffer + strlen(MyBuffer), ", %s", param);
++                       _nc_SPRINTF(MyBuffer + strlen(MyBuffer),
++                                   _nc_SLIMIT(MyLength - strlen(MyBuffer))
++                                   ", %s", param);
+                    }
+                }
+                used = atUnknown;
 diff -Naur ncurses-5.9.orig/ncurses/trace/visbuf.c ncurses-5.9/ncurses/trace/visbuf.c
---- ncurses-5.9.orig/ncurses/trace/visbuf.c     2012-02-16 18:25:12.679810567 +0000
-+++ ncurses-5.9/ncurses/trace/visbuf.c  2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/trace/visbuf.c     2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/ncurses/trace/visbuf.c  2012-08-25 19:58:00.926560395 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2001-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38742 +54725 @@
  
 -MODULE_ID("$Id: visbuf.c,v 1.37 2010/05/29 18:51:41 tom Exp $")
-+MODULE_ID("$Id: visbuf.c,v 1.38 2011/10/22 16:34:50 tom Exp $")
++MODULE_ID("$Id: visbuf.c,v 1.40 2012/02/22 22:40:24 tom Exp $")
  
  #define NUM_VISBUFS 4
  
-@@ -261,7 +261,7 @@
+@@ -55,8 +55,16 @@
+ static const char r_brace[] = StringOf(R_BRACE);
+ #endif
+ 
++#if USE_STRING_HACKS && HAVE_SNPRINTF
++#define VisChar(tp, chr, limit) _nc_vischar(tp, chr, limit)
++#define LIMIT_ARG ,size_t limit
++#else
++#define VisChar(tp, chr, limit) _nc_vischar(tp, chr)
++#define LIMIT_ARG              /* nothing */
++#endif
++
+ static char *
+-_nc_vischar(char *tp, unsigned c)
++_nc_vischar(char *tp, unsigned c LIMIT_ARG)
+ {
+     if (c == '"' || c == '\\') {
+        *tp++ = '\\';
+@@ -84,7 +92,8 @@
+        *tp++ = '^';
+        *tp++ = (char) ('@' + c);
+     } else {
+-       sprintf(tp, "\\%03lo", (unsigned long) ChCharOf(c));
++       _nc_SPRINTF(tp, _nc_SLIMIT(limit)
++                   "\\%03lo", (unsigned long) ChCharOf(c));
+        tp += strlen(tp);
+     }
+     *tp = 0;
+@@ -97,6 +106,7 @@
+     const char *vbuf = 0;
+     char *tp;
+     int c;
++    int count;
+ 
+     if (buf == 0)
+        return ("(null)");
+@@ -106,6 +116,7 @@
+     if (len < 0)
+        len = (int) strlen(buf);
+ 
++    count = len;
+ #ifdef TRACE
+     vbuf = tp = _nc_trace_buf(bufnum, NormalLen(len));
+ #else
+@@ -124,8 +135,8 @@
+ #endif
+     if (tp != 0) {
+        *tp++ = D_QUOTE;
+-       while ((--len >= 0) && (c = *buf++) != '\0') {
+-           tp = _nc_vischar(tp, UChar(c));
++       while ((--count >= 0) && (c = *buf++) != '\0') {
++           tp = VisChar(tp, UChar(c), NormalLen(len));
+        }
+        *tp++ = D_QUOTE;
+        *tp = '\0';
+@@ -175,6 +186,7 @@
+     const char *vbuf;
+     char *tp;
+     wchar_t c;
++    int count;
+ 
+     if (buf == 0)
+        return ("(null)");
+@@ -182,6 +194,7 @@
+     if (len < 0)
+        len = (int) wcslen(buf);
+ 
++    count = len;
+ #ifdef TRACE
+     vbuf = tp = _nc_trace_buf(bufnum, WideLen(len));
+ #else
+@@ -193,15 +206,16 @@
+ #endif
+     if (tp != 0) {
+        *tp++ = D_QUOTE;
+-       while ((--len >= 0) && (c = *buf++) != '\0') {
++       while ((--count >= 0) && (c = *buf++) != '\0') {
+            char temp[CCHARW_MAX + 80];
+            int j = wctomb(temp, c), k;
+            if (j <= 0) {
+-               sprintf(temp, "\\u%08X", (unsigned) c);
++               _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
++                           "\\u%08X", (unsigned) c);
+                j = (int) strlen(temp);
+            }
+            for (k = 0; k < j; ++k) {
+-               tp = _nc_vischar(tp, UChar(temp[k]));
++               tp = VisChar(tp, UChar(temp[k]), WideLen(len));
+            }
+        }
+        *tp++ = D_QUOTE;
+@@ -261,7 +275,7 @@
  NCURSES_EXPORT(const char *)
  _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
@@ -38755 +54829 @@
      const char *found;
  
+@@ -315,7 +329,7 @@
+                            break;
+                        for (k = 0; k < PUTC_n; k++) {
+                            char temp[80];
+-                           _nc_vischar(temp, UChar(PUTC_buf[k]));
++                           VisChar(temp, UChar(PUTC_buf[k]), sizeof(temp));
+                            (void) _nc_trace_bufcat(bufnum, temp);
+                        }
+                    }
+@@ -323,7 +337,7 @@
+ #else
+                {
+                    char temp[80];
+-                   _nc_vischar(temp, UChar(buf[j]));
++                   VisChar(temp, UChar(buf[j]), sizeof(temp));
+                    result = _nc_trace_bufcat(bufnum, temp);
+                }
+ #endif /* USE_WIDEC_SUPPORT */
+diff -Naur ncurses-5.9.orig/ncurses/tty/hardscroll.c ncurses-5.9/ncurses/tty/hardscroll.c
+--- ncurses-5.9.orig/ncurses/tty/hardscroll.c   2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/hardscroll.c        2012-08-25 19:58:00.926560395 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -147,7 +147,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: hardscroll.c,v 1.47 2010/04/24 23:46:47 tom Exp $")
++MODULE_ID("$Id: hardscroll.c,v 1.49 2012/02/22 22:40:24 tom Exp $")
+ 
+ #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
+ 
+@@ -173,9 +173,9 @@
+ # if USE_HASHMAP
+ #  define oldnums(sp)   (sp)->_oldnum_list
+ #  define OLDNUM(sp,n) oldnums(sp)[n]
+-# else                         /* !USE_HASHMAP */
++# else /* !USE_HASHMAP */
+ #  define OLDNUM(sp,n) NewScreen(sp)->_line[n].oldindex
+-# endif                                /* !USE_HASHMAP */
++# endif        /* !USE_HASHMAP */
+ 
+ #define OLDNUM_SIZE(sp) (sp)->_oldnum_size
+ 
+@@ -302,7 +302,9 @@
+ 
+        *buf = '\0';
+        for (n = 0; n < screen_lines(SP_PARM); n++)
+-           (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(SP_PARM, n));
++           _nc_SPRINTF(buf + strlen(buf),
++                       _nc_SLIMIT(want - strlen(buf))
++                       " %02d", OLDNUM(SP_PARM, n));
+        TR(TRACE_UPDATE | TRACE_MOVE, ("virt %s", buf));
+        free(buf);
+     }
 diff -Naur ncurses-5.9.orig/ncurses/tty/hashmap.c ncurses-5.9/ncurses/tty/hashmap.c
---- ncurses-5.9.orig/ncurses/tty/hashmap.c      2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/tty/hashmap.c   2012-02-16 18:25:12.999819013 +0000
+--- ncurses-5.9.orig/ncurses/tty/hashmap.c      2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/hashmap.c   2012-08-25 19:58:00.049897873 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38784 +54918 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/tty/lib_mvcur.c ncurses-5.9/ncurses/tty/lib_mvcur.c
---- ncurses-5.9.orig/ncurses/tty/lib_mvcur.c    2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/tty/lib_mvcur.c 2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/tty/lib_mvcur.c    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/lib_mvcur.c 2012-08-25 19:58:00.049897873 +0000
 @@ -159,7 +159,7 @@
  #define CUR SP_TERMTYPE
@@ -38814 +54948 @@
      string_desc result;
 diff -Naur ncurses-5.9.orig/ncurses/tty/lib_tstp.c ncurses-5.9/ncurses/tty/lib_tstp.c
---- ncurses-5.9.orig/ncurses/tty/lib_tstp.c     2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/tty/lib_tstp.c  2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/tty/lib_tstp.c     2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/lib_tstp.c  2012-08-25 19:58:00.049897873 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38888 +55022 @@
  #if USE_SIGTSTP                        /* Xenix 2.x doesn't have SIGTSTP, for example */
 diff -Naur ncurses-5.9.orig/ncurses/tty/lib_twait.c ncurses-5.9/ncurses/tty/lib_twait.c
---- ncurses-5.9.orig/ncurses/tty/lib_twait.c    2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/tty/lib_twait.c 2012-02-16 18:25:13.215824712 +0000
+--- ncurses-5.9.orig/ncurses/tty/lib_twait.c    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/lib_twait.c 2012-08-25 19:58:00.833227503 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38914 +55048 @@
  
 -MODULE_ID("$Id: lib_twait.c,v 1.61 2010/12/25 23:43:58 tom Exp $")
-+MODULE_ID("$Id: lib_twait.c,v 1.63 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
++MODULE_ID("$Id: lib_twait.c,v 1.64 2012/02/18 20:32:55 tom Exp $")
  
  static long
@@ -38935 +55069 @@
  
      TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d",
-@@ -247,7 +258,7 @@
+@@ -207,6 +218,7 @@
+     starttime = _nc_gettime(&t0, TRUE);
+ 
+     count = 0;
++    (void) count;
+ 
+ #ifdef NCURSES_WGETCH_EVENTS
+     if ((mode & TW_EVENT) && evl)
+@@ -247,7 +259,7 @@
      }
  #endif
@@ -38944 +55086 @@
  #ifdef NCURSES_WGETCH_EVENTS
      if ((mode & TW_EVENT) && evl) {
-@@ -329,10 +340,12 @@
+@@ -329,10 +341,12 @@
       */
      FD_ZERO(&set);
@@ -38957 +55099 @@
         && (fd = sp->_mouse_fd) >= 0) {
         FD_SET(fd, &set);
-@@ -352,6 +365,31 @@
+@@ -352,6 +366,31 @@
      }
  #endif
@@ -38989 +55131 @@
         struct timeval ntimeout;
         ntimeout.tv_sec = milliseconds / 1000;
-@@ -360,6 +398,7 @@
+@@ -360,6 +399,7 @@
      } else {
         result = select(count, &set, NULL, NULL, NULL);
@@ -38998 +55140 @@
      if ((mode & TW_EVENT) && evl) {
 diff -Naur ncurses-5.9.orig/ncurses/tty/lib_vidattr.c ncurses-5.9/ncurses/tty/lib_vidattr.c
---- ncurses-5.9.orig/ncurses/tty/lib_vidattr.c  2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/tty/lib_vidattr.c       2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/tty/lib_vidattr.c  2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/lib_vidattr.c       2012-08-25 19:58:00.053231190 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39083 +55225 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/tty/tty_update.c ncurses-5.9/ncurses/tty/tty_update.c
---- ncurses-5.9.orig/ncurses/tty/tty_update.c   2012-02-16 18:25:12.671810357 +0000
-+++ ncurses-5.9/ncurses/tty/tty_update.c        2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/tty/tty_update.c   2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/tty/tty_update.c        2012-08-25 19:58:01.469891159 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39097 +55239 @@
  
 -MODULE_ID("$Id: tty_update.c,v 1.264 2010/12/19 01:21:02 tom Exp $")
-+MODULE_ID("$Id: tty_update.c,v 1.267 2011/10/22 17:30:14 tom Exp $")
++MODULE_ID("$Id: tty_update.c,v 1.268 2012/05/12 21:02:00 tom Exp $")
  
  /*
   * This define controls the line-breakout optimization.  Every once in a
-@@ -342,7 +342,7 @@
+@@ -288,13 +288,12 @@
+            int j = CharOfD(ch);
+            chtype temp = UChar(SP_PARM->_acs_map[j]);
+ 
+-           if (!(SP_PARM->_screen_acs_map[j])) {
++           if (temp != 0) {
++               SetChar(my_ch, temp, AttrOf(attr));
++           } else {
++               my_ch = CHDEREF(ch);
+                RemAttr(attr, A_ALTCHARSET);
+-               if (temp == 0)
+-                   temp = ' ';
+            }
+-           if (temp != 0)
+-               SetChar(my_ch, temp, AttrOf(attr));
+        }
+        ch = CHREF(my_ch);
+     }
+@@ -342,7 +341,7 @@
         struct pollfd fds[1];
         fds[0].fd = SP_PARM->_checkfd;
@@ -39110 +55270 @@
         }
  #elif defined(__BEOS__)
-@@ -677,6 +677,9 @@
+@@ -677,6 +676,9 @@
  
      T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM));
@@ -39120 +55280 @@
      /*
       * It is "legal" but unlikely that an application could assign a new
-@@ -1076,7 +1079,7 @@
+@@ -1076,7 +1078,7 @@
  */
  
@@ -39130 +55290 @@
  
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_box_set.c ncurses-5.9/ncurses/widechar/lib_box_set.c
---- ncurses-5.9.orig/ncurses/widechar/lib_box_set.c     2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_box_set.c  2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_box_set.c     2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_box_set.c  2012-08-25 19:58:00.053231190 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39158 +55318 @@
         _tracech_t2(2, rs),
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_cchar.c ncurses-5.9/ncurses/widechar/lib_cchar.c
---- ncurses-5.9.orig/ncurses/widechar/lib_cchar.c       2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_cchar.c    2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_cchar.c       2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_cchar.c    2012-08-25 19:58:01.059893097 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2001-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39172 +55332 @@
  
 -MODULE_ID("$Id: lib_cchar.c,v 1.20 2010/12/25 23:46:26 tom Exp $")
-+MODULE_ID("$Id: lib_cchar.c,v 1.24 2011/10/22 15:52:36 tom Exp $")
++MODULE_ID("$Id: lib_cchar.c,v 1.26 2012/03/24 18:37:17 tom Exp $")
  
  /* 
@@ -39184 +55344 @@
 -       || (len > 1 && wcwidth(wch[0]) < 0)) {
 +       || wch == NULL
-+       || ((len = wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
++       || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
         code = ERR;
      } else {
@@ -39218 +55378 @@
         }
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_get_wch.c ncurses-5.9/ncurses/widechar/lib_get_wch.c
---- ncurses-5.9.orig/ncurses/widechar/lib_get_wch.c     2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_get_wch.c  2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_get_wch.c     2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_get_wch.c  2012-08-25 19:58:00.053231190 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39249 +55409 @@
      returnCode(code);
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.9/ncurses/widechar/lib_get_wstr.c
---- ncurses-5.9.orig/ncurses/widechar/lib_get_wstr.c    2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_get_wstr.c 2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_get_wstr.c    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_get_wstr.c 2012-08-25 19:58:00.053231190 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39286 +55446 @@
         *--last = '\0';
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_ins_wch.c ncurses-5.9/ncurses/widechar/lib_ins_wch.c
---- ncurses-5.9.orig/ncurses/widechar/lib_ins_wch.c     2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_ins_wch.c  2012-02-16 18:25:13.003819118 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_ins_wch.c     2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_ins_wch.c  2012-08-25 19:58:00.053231190 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39314 +55474 @@
                 } else {
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_inwstr.c ncurses-5.9/ncurses/widechar/lib_inwstr.c
---- ncurses-5.9.orig/ncurses/widechar/lib_inwstr.c      2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_inwstr.c   2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_inwstr.c      2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_inwstr.c   2012-08-25 19:58:00.056564508 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39348 +55508 @@
  }
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_slk_wset.c ncurses-5.9/ncurses/widechar/lib_slk_wset.c
---- ncurses-5.9.orig/ncurses/widechar/lib_slk_wset.c    2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_slk_wset.c 2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_slk_wset.c    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_slk_wset.c 2012-08-25 19:58:00.056564508 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39401 +55561 @@
      returnCode(result);
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.9/ncurses/widechar/lib_unget_wch.c
---- ncurses-5.9.orig/ncurses/widechar/lib_unget_wch.c   2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_unget_wch.c        2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_unget_wch.c   2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_unget_wch.c        2012-08-25 19:58:00.056564508 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39429 +55589 @@
      }
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.9/ncurses/widechar/lib_vid_attr.c
---- ncurses-5.9.orig/ncurses/widechar/lib_vid_attr.c    2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_vid_attr.c 2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_vid_attr.c    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_vid_attr.c 2012-08-25 19:58:01.733223247 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2002-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39443 +55603 @@
  
 -MODULE_ID("$Id: lib_vid_attr.c,v 1.14 2010/12/19 01:44:24 tom Exp $")
-+MODULE_ID("$Id: lib_vid_attr.c,v 1.15 2011/05/28 21:25:07 tom Exp $")
++MODULE_ID("$Id: lib_vid_attr.c,v 1.16 2012/06/09 20:29:33 tom Exp $")
  
  #define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc)
  
+@@ -120,7 +120,7 @@
+         * A_ALTCHARSET (256) down 2 to line up.  We use the NCURSES_BITS
+         * macro so this will work properly for the wide-character layout.
+         */
+-       unsigned value = no_color_video;
++       unsigned value = (unsigned) no_color_video;
+        attr_t mask = NCURSES_BITS((value & 63)
+                                   | ((value & 192) << 1)
+                                   | ((value & 256) >> 2), 8);
 @@ -296,24 +296,26 @@
  NCURSES_EXPORT(attr_t)
@@ -39490 +55659 @@
  }
 diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.9/ncurses/widechar/lib_wunctrl.c
---- ncurses-5.9.orig/ncurses/widechar/lib_wunctrl.c     2012-02-16 18:25:12.667810252 +0000
-+++ ncurses-5.9/ncurses/widechar/lib_wunctrl.c  2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/ncurses/widechar/lib_wunctrl.c     2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/ncurses/widechar/lib_wunctrl.c  2012-08-25 19:58:00.056564508 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39534 +55703 @@
  
  #if NCURSES_SP_FUNCS
+diff -Naur ncurses-5.9.orig/ncurses/win32con/win_driver.c ncurses-5.9/ncurses/win32con/win_driver.c
+--- ncurses-5.9.orig/ncurses/win32con/win_driver.c      2012-08-25 19:57:59.416567535 +0000
++++ ncurses-5.9/ncurses/win32con/win_driver.c   2012-08-25 19:58:00.836560821 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -28,7 +28,6 @@
+ 
+ /****************************************************************************
+  *  Author: Juergen Pfeifer                                                 *
+- *                                                                          *
+  ****************************************************************************/
+ 
+ /*
+@@ -39,12 +38,12 @@
+ #include <curses.priv.h>
+ #define CUR my_term.type.
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.10 2010/12/25 19:28:21 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.11 2012/02/18 20:28:25 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ 
+ #define AssertTCB() assert(TCB!=0 && TCB->magic==WINMAGIC)
+-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp
++#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp
+ 
+ #define GenMap(vKey,key) MAKELONG(key, vKey)
+ 
+@@ -308,7 +307,7 @@
+ 
+ static int
+ drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB,
+-               bool beepFlag GCC_UNUSED)
++               int beepFlag GCC_UNUSED)
+ {
+     SCREEN *sp;
+     int res = ERR;
+@@ -348,7 +347,7 @@
+ 
+ static void
+ drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB,
+-            bool fore,
++            int fore,
+             int color,
+             int (*outc) (SCREEN *, int) GCC_UNUSED)
+ {
+@@ -412,7 +411,7 @@
+ }
+ 
+ static int
+-drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf)
++drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, int setFlag, TTY * buf)
+ {
+     DWORD dwFlag = 0;
+     tcflag_t iflag;
+@@ -479,7 +478,7 @@
+ }
+ 
+ static int
+-drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag)
++drv_mode(TERMINAL_CONTROL_BLOCK * TCB, int progFlag, int defFlag)
+ {
+     SCREEN *sp;
+     TERMINAL *_term = (TERMINAL *) TCB;
+@@ -674,9 +673,9 @@
+ 
+ static void
+ drv_initpair(TERMINAL_CONTROL_BLOCK * TCB,
+-            short pair,
+-            short f,
+-            short b)
++            int pair,
++            int f,
++            int b)
+ {
+     SCREEN *sp;
+ 
+@@ -691,10 +690,10 @@
+ 
+ static void
+ drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB,
+-             short color GCC_UNUSED,
+-             short r GCC_UNUSED,
+-             short g GCC_UNUSED,
+-             short b GCC_UNUSED)
++             int color GCC_UNUSED,
++             int r GCC_UNUSED,
++             int g GCC_UNUSED,
++             int b GCC_UNUSED)
+ {
+     SCREEN *sp;
+ 
+@@ -704,9 +703,9 @@
+ 
+ static void
+ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
+-            short old_pair GCC_UNUSED,
+-            short pair GCC_UNUSED,
+-            bool reverse GCC_UNUSED,
++            int old_pair GCC_UNUSED,
++            int pair GCC_UNUSED,
++            int reverse GCC_UNUSED,
+             int (*outc) (SCREEN *, int) GCC_UNUSED
+ )
+ {
+@@ -778,7 +777,7 @@
+ 
+ static void
+ drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB,
+-                bool OnFlag GCC_UNUSED)
++                int OnFlag GCC_UNUSED)
+ {
+     SCREEN *sp;
+ 
+@@ -1080,7 +1079,6 @@
+     BOOL b;
+     DWORD nRead;
+     WORD vk;
+-    WORD sc;
+ 
+     AssertTCB();
+     assert(buf);
+@@ -1096,7 +1094,6 @@
+                    continue;
+                *buf = (int) inp_rec.Event.KeyEvent.uChar.AsciiChar;
+                vk = inp_rec.Event.KeyEvent.wVirtualKeyCode;
+-               sc = inp_rec.Event.KeyEvent.wVirtualScanCode;
+                if (*buf == 0) {
+                    if (sp->_keypad_on) {
+                        *buf = MapKey(TCB, vk);
+@@ -1157,7 +1154,7 @@
+ }
+ 
+ static int
+-drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag GCC_UNUSED)
++drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, int flag GCC_UNUSED)
+ {
+     SCREEN *sp;
+     int code = ERR;
+@@ -1172,7 +1169,7 @@
+ }
+ 
+ static int
+-drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, bool flag)
++drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, int flag)
+ {
+     int code = ERR;
+     SCREEN *sp;
+diff -Naur ncurses-5.9.orig/package/debian/changelog ncurses-5.9/package/debian/changelog
+--- ncurses-5.9.orig/package/debian/changelog   1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/changelog        2012-08-25 19:58:02.389886808 +0000
+@@ -0,0 +1,11 @@
++ncurses6 (5.9-20120811) unstable; urgency=low
++
++  * latest weekly patch
++
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Aug 2012 17:52:54 -0400
++
++ncurses6 (5.9-20120608) unstable; urgency=low
++
++  * initial release
++
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 08 Jun 2012 07:54:29 -0400
+diff -Naur ncurses-5.9.orig/package/debian/compat ncurses-5.9/package/debian/compat
+--- ncurses-5.9.orig/package/debian/compat      1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/compat   2012-08-25 19:58:01.596557226 +0000
+@@ -0,0 +1 @@
++5
+diff -Naur ncurses-5.9.orig/package/debian/control ncurses-5.9/package/debian/control
+--- ncurses-5.9.orig/package/debian/control     1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/control  2012-08-25 19:58:01.596557226 +0000
+@@ -0,0 +1,16 @@
++Source: ncurses6
++Section: libdevel
++Priority: optional
++Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
++Homepage: http://invisible-island.net/ncurses/
++Build-Depends: debhelper (>= 7)
++Standards-Version: 3.8.2
++
++Package: ncurses6
++Architecture: any
++Depends: ${misc:Depends}
++Description: shared libraries for terminal handling
++ The ncurses library routines are a terminal-independent method of
++ updating character screens with reasonable optimization.
++ .
++ This package is used for testing ABI 6.
+diff -Naur ncurses-5.9.orig/package/debian/copyright ncurses-5.9/package/debian/copyright
+--- ncurses-5.9.orig/package/debian/copyright   1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/copyright        2012-08-25 19:58:01.596557226 +0000
+@@ -0,0 +1,112 @@
++This package is used for testing builds of ncurses.
++
++Copyright (c) 1998-2012 Free Software Foundation, Inc.
++Copyright © 2001 by Pradeep Padala
++
++Permission is hereby granted, free of charge, to any person obtaining a
++copy of this software and associated documentation files (the
++"Software"), to deal in the Software without restriction, including
++without limitation the rights to use, copy, modify, merge, publish,
++distribute, distribute with modifications, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included
++in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
++DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
++THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name(s) of the above copyright
++holders shall not be used in advertising or otherwise to promote the
++sale, use or other dealings in this Software without prior written
++authorization.
++
++
++Copyright (C) 1994 X Consortium
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to
++deal in the Software without restriction, including without limitation the
++rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++sell copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of the X Consortium shall not
++be used in advertising or otherwise to promote the sale, use or other deal-
++ings in this Software without prior written authorization from the X Consor-
++tium.
++
++
++Copyright (c) 1980, 1991, 1992, 1993
++       The Regents of the University of California.  All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++1. Redistributions of source code must retain the above copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the above copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. Neither the name of the University nor the names of its contributors
++   may be used to endorse or promote products derived from this software
++   without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGE.
++
++
++Copyright 1996-2007 by Thomas E. Dickey
++
++                        All Rights Reserved
++
++Permission is hereby granted, free of charge, to any person obtaining a
++copy of this software and associated documentation files (the
++"Software"), to deal in the Software without restriction, including
++without limitation the rights to use, copy, modify, merge, publish,
++distribute, sublicense, and/or sell copies of the Software, and to
++permit persons to whom the Software is furnished to do so, subject to
++the following conditions:
++
++The above copyright notice and this permission notice shall be included
++in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
++CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name(s) of the above copyright
++holders shall not be used in advertising or otherwise to promote the
++sale, use or other dealings in this Software without prior written
++authorization.
++
++-- vile: txtmode file-encoding=utf-8
+diff -Naur ncurses-5.9.orig/package/debian/rules ncurses-5.9/package/debian/rules
+--- ncurses-5.9.orig/package/debian/rules       1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/rules    2012-08-25 19:58:01.866555950 +0000
+@@ -0,0 +1,118 @@
++#!/usr/bin/make -f
++# MAde with the aid of dh_make, by Craig Small
++# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
++# Some lines taken from debmake, by Cristoph Lameter.
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++# These are used for cross-compiling and for saving the configure script
++# from having to guess our platform (since we know it already)
++DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
++CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
++
++MY_DIR=/usr/local/ncurses6
++MYDATA=/usr/local/ncurses/share/terminfo
++
++CFLAGS = $(CC_NORMAL)
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++        CFLAGS += -O0
++else
++        CFLAGS += -O2
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++        INSTALL_PROGRAM += -s
++endif
++
++
++configure: configure-stamp
++configure-stamp:
++       dh_testdir
++
++       RPATH_LIST=../lib:$(MY_DIR)/lib \
++       CFLAGS="$(CFLAGS)" ./configure \
++               --host=$(DEB_HOST_GNU_TYPE) \
++               --build=$(DEB_BUILD_GNU_TYPE) \
++               --prefix=$(MY_DIR) \
++               --with-default-terminfo-dir=$(MYDATA) \
++               --with-terminfo-dirs=$(MYDATA):/usr/share/terminfo \
++               --disable-echo \
++               --disable-getcap \
++               --disable-leaks \
++               --disable-macros  \
++               --disable-termcap \
++               --enable-const \
++               --enable-ext-colors \
++               --enable-ext-mouse \
++               --enable-hard-tabs \
++               --enable-interop \
++               --enable-rpath \
++               --enable-sp-funcs \
++               --enable-warnings \
++               --enable-widec \
++               --verbose \
++               --with-develop \
++               --with-shared \
++               --with-termlib \
++               --with-ticlib \
++               --with-trace \
++               --with-xterm-kbs=DEL \
++               --without-ada \
++               --without-debug \
++               --without-normal
++
++       touch configure-stamp
++
++build: build-stamp
++build-stamp: configure-stamp
++       dh_testdir
++
++       $(MAKE)
++
++       touch build-stamp
++
++clean:
++       dh_testdir
++       dh_testroot
++
++       [ ! -f makefile ] || $(MAKE) distclean
++
++       rm -f configure-stamp build-stamp install-stamp
++
++       dh_clean
++
++install: install-stamp
++install-stamp: build-stamp
++       dh_testdir
++       dh_testroot
++       dh_clean -k
++       dh_installdirs
++
++       $(MAKE) install.libs install.progs DESTDIR=$(CURDIR)/debian/ncurses6
++
++       touch install-stamp
++
++# Build architecture-independent files here.
++binary-indep: build install
++# No binary-indep target.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++       dh_testdir
++       dh_testroot
++       dh_installchangelogs NEWS
++       dh_strip
++       dh_compress
++       dh_fixperms
++       dh_installdeb
++       dh_shlibdeps
++       dh_gencontrol
++       dh_md5sums
++       dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install install-stamp
+diff -Naur ncurses-5.9.orig/package/debian/source/format ncurses-5.9/package/debian/source/format
+--- ncurses-5.9.orig/package/debian/source/format       1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/source/format    2012-08-25 19:58:01.599890543 +0000
+@@ -0,0 +1 @@
++3.0 (native)
+diff -Naur ncurses-5.9.orig/package/debian/watch ncurses-5.9/package/debian/watch
+--- ncurses-5.9.orig/package/debian/watch       1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/debian/watch    2012-08-25 19:58:01.599890543 +0000
+@@ -0,0 +1,4 @@
++version=3
++
++opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
++ debian  uupdate
+diff -Naur ncurses-5.9.orig/package/ncurses.spec ncurses-5.9/package/ncurses.spec
+--- ncurses-5.9.orig/package/ncurses.spec       1970-01-01 00:00:00.000000000 +0000
++++ ncurses-5.9/package/ncurses.spec    2012-08-25 19:58:02.389886808 +0000
+@@ -0,0 +1,82 @@
++Summary: shared libraries for terminal handling
++Name: ncurses6
++Release: 5.9
++Version: 20120811
++License: X11
++Group: Development/Libraries
++Source: ncurses-%{release}-%{version}.tgz
++# URL: http://invisible-island.net/ncurses/
++
++%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
++%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
++
++%define _prefix /usr/local/ncurses6
++%define MYDATA /usr/local/ncurses/share/terminfo
++
++%description
++The ncurses library routines are a terminal-independent method of
++updating character screens with reasonable optimization.
++
++This package is used for testing ABI 6.
++
++%prep
++
++%setup -q -n ncurses-%{release}-%{version}
++
++%build
++CFLAGS="%{CC_NORMAL}" \
++RPATH_LIST=../lib:%{_prefix}/lib \
++%configure \
++       --target %{_target_platform} \
++       --prefix=%{_prefix} \
++       --includedir='${prefix}/include' \
++       --with-default-terminfo-dir=%{MYDATA} \
++       --with-install-prefix=$RPM_BUILD_ROOT \
++       --with-terminfo-dirs=%{MYDATA}:/usr/share/terminfo \
++       --disable-echo \
++       --disable-getcap \
++       --disable-leaks \
++       --disable-macros  \
++       --disable-overwrite  \
++       --disable-termcap \
++       --enable-const \
++       --enable-ext-colors \
++       --enable-ext-mouse \
++       --enable-hard-tabs \
++       --enable-interop \
++       --enable-rpath \
++       --enable-sp-funcs \
++       --enable-warnings \
++       --enable-widec \
++       --verbose \
++       --with-develop \
++       --with-shared \
++       --with-termlib \
++       --with-ticlib \
++       --with-trace \
++       --with-xterm-kbs=DEL \
++       --without-ada \
++       --without-debug \
++       --without-normal
++
++make
++
++%install
++rm -rf $RPM_BUILD_ROOT
++
++make install.libs install.progs
++
++%clean
++rm -rf $RPM_BUILD_ROOT
++
++%files
++%defattr(-,root,root,-)
++%{_bindir}/*
++%{_includedir}/*
++%{_libdir}/*
++#%{_datadir}/*
++
++%changelog
++
++* Fri Jun 08 2012 Thomas E. Dickey
++- initial version.
 diff -Naur ncurses-5.9.orig/panel/Makefile.in ncurses-5.9/panel/Makefile.in
---- ncurses-5.9.orig/panel/Makefile.in  2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/panel/Makefile.in       2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/panel/Makefile.in  2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/panel/Makefile.in       2012-08-25 19:58:02.389886808 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.58 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.59 2011/08/07 15:46:50 tom Exp $
++# $Id: Makefile.in,v 1.60 2012/08/11 21:31:56 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
@@ -39546 +56245 @@
  # Permission is hereby granted, free of charge, to any person obtaining a    #
  # copy of this software and associated documentation files (the "Software"), #
-@@ -103,6 +103,7 @@
+@@ -57,6 +57,7 @@
+ bindir         = @bindir@
+ libdir         = @libdir@
+ includedir     = @includedir@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ 
+ LIBTOOL                = @LIBTOOL@
+@@ -103,6 +104,7 @@
  SHLIB_DIRS     = -L../lib
  SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
@@ -39554 +56261 @@
  
  NCURSES_MAJOR  = @NCURSES_MAJOR@
+diff -Naur ncurses-5.9.orig/panel/p_above.c ncurses-5.9/panel/p_above.c
+--- ncurses-5.9.orig/panel/p_above.c    2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/panel/p_above.c 2012-08-25 19:58:00.989893428 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,13 +36,13 @@
+  */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $")
++MODULE_ID("$Id: p_above.c,v 1.9 2012/03/10 23:43:41 tom Exp $")
+ 
+ #if NCURSES_SP_FUNCS
+ NCURSES_EXPORT(PANEL *)
+ ground_panel(SCREEN * sp)
+ {
+-  T((T_CALLED("ground_panel(%p)"), sp));
++  T((T_CALLED("ground_panel(%p)"), (void *)sp));
+   if (sp)
+     {
+       struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
+diff -Naur ncurses-5.9.orig/panel/p_below.c ncurses-5.9/panel/p_below.c
+--- ncurses-5.9.orig/panel/p_below.c    2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/panel/p_below.c 2012-08-25 19:58:00.989893428 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,13 +36,13 @@
+  */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: p_below.c,v 1.8 2010/01/23 21:22:15 tom Exp $")
++MODULE_ID("$Id: p_below.c,v 1.9 2012/03/10 23:43:41 tom Exp $")
+ 
+ #if NCURSES_SP_FUNCS
+ NCURSES_EXPORT(PANEL *)
+ ceiling_panel(SCREEN * sp)
+ {
+-  T((T_CALLED("ceiling_panel(%p)"), sp));
++  T((T_CALLED("ceiling_panel(%p)"), (void *)sp));
+   if (sp)
+     {
+       struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
+diff -Naur ncurses-5.9.orig/panel/panel.c ncurses-5.9/panel/panel.c
+--- ncurses-5.9.orig/panel/panel.c      2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/panel/panel.c   2012-08-25 19:58:00.926560395 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,7 +36,7 @@
+ /* panel.c -- implementation of panels library, some core routines */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: panel.c,v 1.25 2010/01/23 21:22:16 tom Exp $")
++MODULE_ID("$Id: panel.c,v 1.26 2012/02/23 10:02:15 tom Exp $")
+ 
+ /*+-------------------------------------------------------------------------
+        _nc_retrace_panel (pan)
+@@ -61,9 +61,9 @@
+   char temp[32];
+ 
+   if (ptr != 0)
+-    sprintf(temp, "ptr:%p", ptr);
++    _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "ptr:%p", ptr);
+   else
+-    strcpy(temp, "<null>");
++    _nc_STRCPY(temp, "<null>", sizeof(temp));
+   return _nc_visbuf(temp);
+ }
+ #endif
+@@ -95,7 +95,7 @@
+ 
+   GetPanelHook(pan);
+ 
+-  sprintf(s80, fmt, num, pan);
++  _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) fmt, num, pan);
+   _tracef("%s b=%s t=%s", s80,
+          (_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--",
+          (_nc_top_panel) ? USER_PTR(_nc_top_panel->user) : "--");
+@@ -143,7 +143,7 @@
+ {
+   char s80[80];
+ 
+-  sprintf(s80, "Touchline s=%d c=%d", start, count);
++  _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) "Touchline s=%d c=%d", start, count);
+   dPanel(s80, pan);
+   touchline(pan->win, start, count);
+ }
 diff -Naur ncurses-5.9.orig/panel/panel.priv.h ncurses-5.9/panel/panel.priv.h
---- ncurses-5.9.orig/panel/panel.priv.h 2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/panel/panel.priv.h      2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/panel/panel.priv.h 2012-08-25 19:57:59.393234312 +0000
++++ ncurses-5.9/panel/panel.priv.h      2012-08-25 19:58:00.056564508 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39583 +56391 @@
          COMPUTE_INTERSECTION(pan, pan2, ix1, ix2, iy1, iy2);\
 diff -Naur ncurses-5.9.orig/progs/Makefile.in ncurses-5.9/progs/Makefile.in
---- ncurses-5.9.orig/progs/Makefile.in  2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/progs/Makefile.in       2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/progs/Makefile.in  2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/Makefile.in       2012-08-25 19:58:02.389886808 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.85 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.87 2011/09/24 15:13:34 nix Exp $
++# $Id: Makefile.in,v 1.89 2012/08/11 21:31:56 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
  #                                                                            #
  # Permission is hereby granted, free of charge, to any person obtaining a    #
  # copy of this software and associated documentation files (the "Software"), #
-@@ -104,20 +104,21 @@
+@@ -61,6 +61,7 @@
+ bindir         = @bindir@
+ libdir         = @libdir@
+ includedir     = @includedir@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ 
+ LIBTOOL                = @LIBTOOL@
+@@ -104,20 +105,21 @@
  LD             = @LD@
  LINK           = @LINK_PROGS@ $(LIBTOOL_LINK)
@@ -39621 +56437 @@
  LINT           = @LINT@
  LINT_OPTS      = @LINT_OPTS@
+@@ -230,46 +232,46 @@
+        $(MODEL)/transform$o
+ 
+ tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
+-       @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@
+ 
+ DEPS_TOE = \
+        $(MODEL)/toe$o
+ 
+ toe$x: $(DEPS_TOE) $(DEPS_CURSES)
+-       @ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
+ 
+ DEPS_CLEAR = \
+        $(MODEL)/clear$o
+ 
+ clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
+-       @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
+ 
+ DEPS_TABS = \
+        $(MODEL)/tabs$o
+ 
+ tabs$x: $(DEPS_TABS) $(DEPS_TABS)
+-       @ECHO_LINK@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
+ 
+ DEPS_TPUT = \
+        $(MODEL)/tput$o \
+        $(MODEL)/transform$o
+ 
+ tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
+-       @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
+ 
+ DEPS_INFOCMP = \
+        $(MODEL)/infocmp$o \
+        $(MODEL)/dump_entry$o
+ 
+ infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
+-       @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
+ 
+ DEPS_TSET = \
+        $(MODEL)/tset$o \
+        $(MODEL)/transform$o
+ 
+ tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
+-       @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
++       @ECHO_LD@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
+ 
+ termsort.c: $(srcdir)/MKtermsort.sh
+        sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
 diff -Naur ncurses-5.9.orig/progs/capconvert ncurses-5.9/progs/capconvert
---- ncurses-5.9.orig/progs/capconvert   2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/progs/capconvert        2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/progs/capconvert   2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/capconvert        2012-08-25 19:58:00.056564508 +0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
@@ -39702 +56572 @@
         echo "Done."
 diff -Naur ncurses-5.9.orig/progs/dump_entry.c ncurses-5.9/progs/dump_entry.c
---- ncurses-5.9.orig/progs/dump_entry.c 2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/progs/dump_entry.c      2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/progs/dump_entry.c 2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/progs/dump_entry.c      2012-08-25 19:58:01.736556564 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39716 +56586 @@
  
 -MODULE_ID("$Id: dump_entry.c,v 1.89 2010/05/01 22:04:08 tom Exp $")
-+MODULE_ID("$Id: dump_entry.c,v 1.95 2011/08/07 22:10:17 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.100 2012/06/09 21:44:40 tom Exp $")
  
  #define INDENT                 8
@@ -39807 +56677 @@
  
         if (!version_filter(BOOLEAN, i))
-@@ -619,12 +640,12 @@
+@@ -610,21 +631,21 @@
+ 
+        predval = pred(BOOLEAN, i);
+        if (predval != FAIL) {
+-           (void) strcpy(buffer, name);
++           _nc_STRCPY(buffer, name, sizeof(buffer));
+            if (predval <= 0)
+-               (void) strcat(buffer, "@");
++               _nc_STRCAT(buffer, "@", sizeof(buffer));
+            else if (i + 1 > num_bools)
+                num_bools = i + 1;
+            WRAP_CONCAT;
         }
      }
@@ -39822 +56703 @@
  
         if (!version_filter(NUMBER, i))
-@@ -645,7 +666,7 @@
+@@ -635,9 +656,11 @@
+        predval = pred(NUMBER, i);
+        if (predval != FAIL) {
+            if (tterm->Numbers[i] < 0) {
+-               sprintf(buffer, "%s@", name);
++               _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                           "%s@", name);
+            } else {
+-               sprintf(buffer, "%s#%d", name, tterm->Numbers[i]);
++               _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                           "%s#%d", name, tterm->Numbers[i]);
+                if (i + 1 > num_values)
+                    num_values = i + 1;
+            }
+@@ -645,7 +668,7 @@
         }
      }
@@ -39831 +56726 @@
  
      len += (int) (num_bools
-@@ -670,7 +691,7 @@
+@@ -670,7 +693,7 @@
  
      for_each_string(j, tterm) {
@@ -39840 +56735 @@
  
         capability = tterm->Strings[i];
-@@ -846,7 +867,7 @@
+@@ -698,14 +721,14 @@
+            if (PRESENT(insert_character) || PRESENT(parm_ich)) {
+                if (SAME_CAP(i, enter_insert_mode)
+                    && enter_insert_mode == ABSENT_STRING) {
+-                   (void) strcpy(buffer, "im=");
++                   _nc_STRCPY(buffer, "im=", sizeof(buffer));
+                    WRAP_CONCAT;
+                    continue;
+                }
+ 
+                if (SAME_CAP(i, exit_insert_mode)
+                    && exit_insert_mode == ABSENT_STRING) {
+-                   (void) strcpy(buffer, "ei=");
++                   _nc_STRCPY(buffer, "ei=", sizeof(buffer));
+                    WRAP_CONCAT;
+                    continue;
+                }
+@@ -739,7 +762,8 @@
+                num_strings = i + 1;
+ 
+            if (!VALID_STRING(capability)) {
+-               sprintf(buffer, "%s@", name);
++               _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                           "%s@", name);
+                WRAP_CONCAT;
+            } else if (outform == F_TERMCAP || outform == F_TCONVERR) {
+                int params = ((i < (int) SIZEOF(parametrized))
+@@ -750,13 +774,14 @@
+ 
+                if (cv == 0) {
+                    if (outform == F_TCONVERR) {
+-                       sprintf(buffer, "%s=!!! %s WILL NOT CONVERT !!!",
+-                               name, srccap);
++                       _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                                   "%s=!!! %s WILL NOT CONVERT !!!",
++                                   name, srccap);
+                    } else if (suppress_untranslatable) {
+                        continue;
+                    } else {
+                        char *s = srccap, *d = buffer;
+-                       sprintf(d, "..%s=", name);
++                       _nc_SPRINTF(d, _nc_SLIMIT(sizeof(buffer)) "..%s=", name);
+                        d += strlen(d);
+                        while ((*d = *s++) != 0) {
+                            if (*d == ':') {
+@@ -769,7 +794,8 @@
+                        }
+                    }
+                } else {
+-                   sprintf(buffer, "%s=%s", name, cv);
++                   _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                               "%s=%s", name, cv);
+                }
+                len += (int) strlen(capability) + 1;
+                WRAP_CONCAT;
+@@ -805,11 +831,13 @@
+      */
+     if (tversion == V_HPUX) {
+        if (VALID_STRING(memory_lock)) {
+-           (void) sprintf(buffer, "meml=%s", memory_lock);
++           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                       "meml=%s", memory_lock);
+            WRAP_CONCAT;
+        }
+        if (VALID_STRING(memory_unlock)) {
+-           (void) sprintf(buffer, "memu=%s", memory_unlock);
++           _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                       "memu=%s", memory_unlock);
+            WRAP_CONCAT;
+        }
+     } else if (tversion == V_AIX) {
+@@ -832,9 +860,11 @@
+            tp[0] = '\0';
+ 
+            if (box_ok) {
+-               (void) strcpy(buffer, "box1=");
+-               (void) strcat(buffer, _nc_tic_expand(boxchars,
+-                                                    outform == F_TERMINFO, numbers));
++               _nc_STRCPY(buffer, "box1=", sizeof(buffer));
++               _nc_STRCAT(buffer,
++                          _nc_tic_expand(boxchars,
++                                         outform == F_TERMINFO, numbers),
++                          sizeof(buffer));
+                WRAP_CONCAT;
+            }
+        }
+@@ -846,7 +876,7 @@
       */
      if (outcount) {
@@ -39849 +56830 @@
             && outbuf.text[j - 1] == '\t'
             && outbuf.text[j - 2] == '\n') {
-@@ -1064,7 +1085,7 @@
+@@ -926,7 +956,7 @@
+     char name[10];
+ 
+     for (n = 0; n <= 10; ++n) {
+-       sprintf(name, "lf%d", n);
++       _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n);
+        if ((cap = find_string(tterm, name)) != ABSENT_STRING
+            && kill_string(tterm, cap)) {
+            target -= (int) (strlen(cap) + 5);
+@@ -951,7 +981,7 @@
+     char name[10];
+ 
+     for (n = 60; n >= 0; --n) {
+-       sprintf(name, "kf%d", n);
++       _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n);
+        if ((cap = find_string(tterm, name)) != ABSENT_STRING
+            && kill_string(tterm, cap)) {
+            target -= (int) (strlen(cap) + 5);
+@@ -1064,7 +1094,7 @@
              */
             unsigned n;
@@ -39858 +56857 @@
                 if (VALID_STRING(tterm->Strings[n])) {
                     set_attributes = ABSENT_STRING;
-@@ -1151,14 +1172,37 @@
+@@ -1144,21 +1174,45 @@
+ 
+     if (outform == F_TERMCAP || outform == F_TCONVERR)
+        trim_trailing();
+-    (void) sprintf(buffer, "%s%s", infodump ? "use=" : "tc=", name);
++    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++               "%s%s", infodump ? "use=" : "tc=", name);
+     wrap_concat(buffer);
+ }
+ 
  int
  show_entry(void)
@@ -39868 +56876 @@
 +    if (outbuf.used != 0) {
 +       bool infodump = (outform != F_TERMCAP && outform != F_TCONVERR);
-+       char delim = infodump ? ',' : ':';
++       char delim = (char) (infodump ? ',' : ':');
 +       int j;
 +
@@ -39876 +56884 @@
 +               ;
 +           } else if (isspace(UChar(ch))) {
-+               outbuf.used = j;
++               outbuf.used = (size_t) j;
 +           } else if (!infodump && ch == '\\') {
-+               outbuf.used = j;
++               outbuf.used = (size_t) j;
 +           } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) {
-+               outbuf.used = (j + 1);
++               outbuf.used = (size_t) (j + 1);
 +           } else {
 +               break;
@@ -39898 +56906 @@
               bool quiet)
  /* compare two entries */
-@@ -1170,7 +1214,7 @@
+@@ -1170,7 +1224,7 @@
         fputs("    comparing booleans.\n", stdout);
      for_each_boolean(j, tp) {
@@ -39907 +56915 @@
         if (isObsolete(outform, name))
             continue;
-@@ -1182,7 +1226,7 @@
+@@ -1182,7 +1236,7 @@
         fputs("    comparing numbers.\n", stdout);
      for_each_number(j, tp) {
@@ -39916 +56924 @@
         if (isObsolete(outform, name))
             continue;
-@@ -1194,7 +1238,7 @@
+@@ -1194,7 +1248,7 @@
         fputs("    comparing strings.\n", stdout);
      for_each_string(j, tp) {
@@ -39926 +56934 @@
             continue;
 diff -Naur ncurses-5.9.orig/progs/dump_entry.h ncurses-5.9/progs/dump_entry.h
---- ncurses-5.9.orig/progs/dump_entry.h 2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/progs/dump_entry.h      2012-02-16 18:25:13.007819223 +0000
+--- ncurses-5.9.orig/progs/dump_entry.h 2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/dump_entry.h      2012-08-25 19:58:00.059897826 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -39969 +56977 @@
  
 diff -Naur ncurses-5.9.orig/progs/infocmp.c ncurses-5.9/progs/infocmp.c
---- ncurses-5.9.orig/progs/infocmp.c    2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/progs/infocmp.c 2012-02-16 18:25:13.011819328 +0000
+--- ncurses-5.9.orig/progs/infocmp.c    2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/infocmp.c 2012-08-25 19:58:01.603223861 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39983 +56991 @@
  
 -MODULE_ID("$Id: infocmp.c,v 1.105 2010/05/01 22:04:08 tom Exp $")
-+MODULE_ID("$Id: infocmp.c,v 1.110 2011/12/17 23:59:50 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.120 2012/06/08 23:05:25 tom Exp $")
  
  #define L_CURL "{"
@@ -39998 +57006 @@
  static int outform = F_TERMINFO;       /* output format */
  static int sortmode;           /* sort_mode */
-@@ -556,7 +557,7 @@
+@@ -86,16 +87,34 @@
+ static bool ignorepads;                /* ignore pad prefixes when diffing */
+ 
+ #if NO_LEAKS
++
++typedef struct {
++    ENTRY *head;
++    ENTRY *tail;
++} ENTERED;
++
++static ENTERED *entered;
++
+ #undef ExitProgram
+ static void ExitProgram(int code) GCC_NORETURN;
+ /* prototype is to get gcc to accept the noreturn attribute */
+ static void
+ ExitProgram(int code)
+ {
+-    while (termcount-- > 0)
+-       _nc_free_termtype(&entries[termcount].tterm);
++    int n;
++
++    for (n = 0; n < termcount; ++n) {
++       ENTRY *new_head = _nc_head;
++       ENTRY *new_tail = _nc_tail;
++       _nc_head = entered[n].head;
++       _nc_tail = entered[n].tail;
++       _nc_free_entries(entered[n].head);
++       _nc_head = new_head;
++       _nc_tail = new_tail;
++    }
+     _nc_leaks_dump_entry();
+     free(entries);
++    free(entered);
+     _nc_free_tic(code);
+ }
+ #endif
+@@ -106,7 +125,7 @@
+ {
+     char *bp;
+ 
+-    (void) strcpy(buf, ptr);
++    _nc_STRCPY(buf, ptr, NAMESIZE);
+     if ((bp = strchr(buf, '|')) != 0)
+        *bp = '\0';
+ 
+@@ -307,13 +326,13 @@
+ {
+     switch (val) {
+     case ABSENT_NUMERIC:
+-       strcpy(buf, s_absent);
++       _nc_STRCPY(buf, s_absent, MAX_STRING);
+        break;
+     case CANCELLED_NUMERIC:
+-       strcpy(buf, s_cancel);
++       _nc_STRCPY(buf, s_cancel, MAX_STRING);
+        break;
+     default:
+-       sprintf(buf, "%d", val);
++       _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING) "%d", val);
+        break;
+     }
+ }
+@@ -323,31 +342,90 @@
+ /* display the value of a string capability */
+ {
+     if (val == ABSENT_STRING)
+-       strcpy(buf, s_absent);
++       _nc_STRCPY(buf, s_absent, MAX_STRING);
+     else if (val == CANCELLED_STRING)
+-       strcpy(buf, s_cancel);
++       _nc_STRCPY(buf, s_cancel, MAX_STRING);
+     else {
+-       sprintf(buf, "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val));
++       _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING)
++                   "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val));
+     }
+ }
+ 
++/*
++ * Show "comparing..." message for the given terminal names.
++ */
++static void
++show_comparing(char **names)
++{
++    if (itrace) {
++       switch (compare) {
++       case C_DIFFERENCE:
++           (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname);
++           break;
++
++       case C_COMMON:
++           (void) fprintf(stderr, "%s: dumping common capabilities\n", _nc_progname);
++           break;
++
++       case C_NAND:
++           (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname);
++           break;
++       }
++    }
++    if (*names) {
++       printf("comparing %s", *names++);
++       if (*names) {
++           printf(" to %s", *names++);
++           while (*names) {
++               printf(", %s", *names++);
++           }
++       }
++       printf(".\n");
++    }
++}
++
++/*
++ * ncurses stores two types of non-standard capabilities:
++ * a) capabilities listed past the "STOP-HERE" comment in the Caps file. 
++ *    These are used in the terminfo source file to provide data for termcaps,
++ *    e.g., when there is no equivalent capability in terminfo, as well as for
++ *    widely-used non-standard capabilities.
++ * b) user-definable capabilities, via "tic -x".
++ *
++ * However, if "-x" is omitted from the tic command, both types of
++ * non-standard capability are not loaded into the terminfo database.  This
++ * macro is used for limit-checks against the symbols that tic uses to omit
++ * the two types of non-standard entry.
++ */
++#define check_user_definable(n,limit) if (!_nc_user_definable && (n) > (limit)) break
++
++/*
++ * Use these macros to simplify loops on C_COMMON and C_NAND:
++ */
++#define for_each_entry() while (entries[extra].tterm.term_names)
++#define next_entry           (&(entries[extra++].tterm))
++
+ static void
+ compare_predicate(PredType type, PredIdx idx, const char *name)
+ /* predicate function to use for entry difference reports */
+ {
+-    register ENTRY *e1 = &entries[0];
+-    register ENTRY *e2 = &entries[1];
+-    char buf1[MAX_STRING], buf2[MAX_STRING];
++    ENTRY *e1 = &entries[0];
++    ENTRY *e2 = &entries[1];
++    char buf1[MAX_STRING];
++    char buf2[MAX_STRING];
+     int b1, b2;
+     int n1, n2;
+     char *s1, *s2;
++    bool found;
++    int extra = 1;
+ 
+     switch (type) {
+     case CMP_BOOLEAN:
++       check_user_definable(idx, BOOLWRITE);
+        b1 = e1->tterm.Booleans[idx];
+-       b2 = e2->tterm.Booleans[idx];
+        switch (compare) {
+        case C_DIFFERENCE:
++           b2 = next_entry->Booleans[idx];
+            if (!(b1 == ABSENT_BOOLEAN && b2 == ABSENT_BOOLEAN) && b1 != b2)
+                (void) printf("\t%s: %s%s%s.\n",
+                              name,
+@@ -357,45 +435,93 @@
+            break;
+ 
+        case C_COMMON:
+-           if (b1 == b2 && b1 != ABSENT_BOOLEAN)
+-               (void) printf("\t%s= %s.\n", name, dump_boolean(b1));
++           if (b1 != ABSENT_BOOLEAN) {
++               found = TRUE;
++               for_each_entry() {
++                   b2 = next_entry->Booleans[idx];
++                   if (b1 != b2) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) printf("\t%s= %s.\n", name, dump_boolean(b1));
++               }
++           }
+            break;
+ 
+        case C_NAND:
+-           if (b1 == ABSENT_BOOLEAN && b2 == ABSENT_BOOLEAN)
+-               (void) printf("\t!%s.\n", name);
++           if (b1 == ABSENT_BOOLEAN) {
++               found = TRUE;
++               for_each_entry() {
++                   b2 = next_entry->Booleans[idx];
++                   if (b1 != b2) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) printf("\t!%s.\n", name);
++               }
++           }
+            break;
+        }
+        break;
+ 
+     case CMP_NUMBER:
++       check_user_definable(idx, NUMWRITE);
+        n1 = e1->tterm.Numbers[idx];
+-       n2 = e2->tterm.Numbers[idx];
+-       dump_numeric(n1, buf1);
+-       dump_numeric(n2, buf2);
+        switch (compare) {
+        case C_DIFFERENCE:
+-           if (!((n1 == ABSENT_NUMERIC && n2 == ABSENT_NUMERIC)) && n1 != n2)
++           n2 = next_entry->Numbers[idx];
++           if (!((n1 == ABSENT_NUMERIC && n2 == ABSENT_NUMERIC)) && n1 != n2) {
++               dump_numeric(n1, buf1);
++               dump_numeric(n2, buf2);
+                (void) printf("\t%s: %s, %s.\n", name, buf1, buf2);
++           }
+            break;
+ 
+        case C_COMMON:
+-           if (n1 != ABSENT_NUMERIC && n2 != ABSENT_NUMERIC && n1 == n2)
+-               (void) printf("\t%s= %s.\n", name, buf1);
++           if (n1 != ABSENT_NUMERIC) {
++               found = TRUE;
++               for_each_entry() {
++                   n2 = next_entry->Numbers[idx];
++                   if (n1 != n2) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   dump_numeric(n1, buf1);
++                   (void) printf("\t%s= %s.\n", name, buf1);
++               }
++           }
+            break;
+ 
+        case C_NAND:
+-           if (n1 == ABSENT_NUMERIC && n2 == ABSENT_NUMERIC)
+-               (void) printf("\t!%s.\n", name);
++           if (n1 == ABSENT_NUMERIC) {
++               found = TRUE;
++               for_each_entry() {
++                   n2 = next_entry->Numbers[idx];
++                   if (n1 != n2) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) printf("\t!%s.\n", name);
++               }
++           }
+            break;
+        }
+        break;
+ 
+     case CMP_STRING:
++       check_user_definable(idx, STRWRITE);
+        s1 = e1->tterm.Strings[idx];
+-       s2 = e2->tterm.Strings[idx];
+        switch (compare) {
+        case C_DIFFERENCE:
++           s2 = next_entry->Strings[idx];
+            if (capcmp(idx, s1, s2)) {
+                dump_string(s1, buf1);
+                dump_string(s2, buf2);
+@@ -405,13 +531,35 @@
+            break;
+ 
+        case C_COMMON:
+-           if (s1 && s2 && !capcmp(idx, s1, s2))
+-               (void) printf("\t%s= '%s'.\n", name, TIC_EXPAND(s1));
++           if (s1 != ABSENT_STRING) {
++               found = TRUE;
++               for_each_entry() {
++                   s2 = next_entry->Strings[idx];
++                   if (capcmp(idx, s1, s2) != 0) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) printf("\t%s= '%s'.\n", name, TIC_EXPAND(s1));
++               }
++           }
+            break;
+ 
+        case C_NAND:
+-           if (!s1 && !s2)
+-               (void) printf("\t!%s.\n", name);
++           if (s1 == ABSENT_STRING) {
++               found = TRUE;
++               for_each_entry() {
++                   s2 = next_entry->Strings[idx];
++                   if (s2 != s1) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) printf("\t!%s.\n", name);
++               }
++           }
+            break;
+        }
+        break;
+@@ -430,16 +578,37 @@
+            break;
+ 
+        case C_COMMON:
+-           if (e1->nuses && e2->nuses && useeq(e1, e2)) {
+-               (void) fputs("\tuse: ", stdout);
+-               print_uses(e1, stdout);
+-               fputs(".\n", stdout);
++           if (e1->nuses) {
++               found = TRUE;
++               for_each_entry() {
++                   e2 = &entries[extra++];
++                   if (e2->nuses != e1->nuses || !useeq(e1, e2)) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) fputs("\tuse: ", stdout);
++                   print_uses(e1, stdout);
++                   fputs(".\n", stdout);
++               }
+            }
+            break;
+ 
+        case C_NAND:
+-           if (!e1->nuses && !e2->nuses)
+-               (void) printf("\t!use.\n");
++           if (!e1->nuses) {
++               found = TRUE;
++               for_each_entry() {
++                   e2 = &entries[extra++];
++                   if (e2->nuses != e1->nuses) {
++                       found = FALSE;
++                       break;
++                   }
++               }
++               if (found) {
++                   (void) printf("\t!use.\n");
++               }
++           }
+            break;
+        }
+     }
+@@ -556,7 +725,7 @@
  }
  
@@ -40007 +57367 @@
      bool result = FALSE;
      if (strncmp(table, param, length) == 0) {
-@@ -795,7 +796,7 @@
+@@ -581,15 +750,15 @@
+                size_t tlen = strlen(ap->from);
+ 
+                if (same_param(ap->from, ep, tlen)) {
+-                   (void) strcat(dst, ap->to);
++                   _nc_STRCAT(dst, ap->to, MAX_TERMINFO_LENGTH);
+                    found = TRUE;
+                    break;
+                }
+            }
+ 
+            if (!found)
+-               (void) strcat(dst, ep);
+-           (void) strcat(dst, ";");
++               _nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH);
++           _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH);
+        } while
+            ((ep = strtok((char *) 0, ";")));
+ 
+@@ -682,7 +851,11 @@
+            && (next = (size_t) csi + len)
+            && ((sp[next] == 'h') || (sp[next] == 'l'))) {
+ 
+-           (void) strcpy(buf2, (sp[next] == 'h') ? "ECMA+" : "ECMA-");
++           _nc_STRCPY(buf2,
++                      ((sp[next] == 'h')
++                       ? "ECMA+"
++                       : "ECMA-"),
++                      sizeof(buf2));
+            (void) strncpy(buf3, sp + csi, len);
+            buf3[len] = '\0';
+            len += (size_t) csi + 1;
+@@ -699,7 +872,11 @@
+            && (next = (size_t) csi + 1 + len)
+            && ((sp[next] == 'h') || (sp[next] == 'l'))) {
+ 
+-           (void) strcpy(buf2, (sp[next] == 'h') ? "DEC+" : "DEC-");
++           _nc_STRCPY(buf2,
++                      ((sp[next] == 'h')
++                       ? "DEC+"
++                       : "DEC-"),
++                      sizeof(buf2));
+            (void) strncpy(buf3, sp + csi + 1, len);
+            buf3[len] = '\0';
+            len += (size_t) csi + 2;
+@@ -715,7 +892,7 @@
+            && (next = (size_t) csi + len)
+            && sp[next] == 'm') {
+ 
+-           (void) strcpy(buf2, "SGR:");
++           _nc_STRCPY(buf2, "SGR:", sizeof(buf2));
+            (void) strncpy(buf3, sp + csi, len);
+            buf3[len] = '\0';
+            len += (size_t) csi + 1;
+@@ -727,8 +904,8 @@
+            && (csi = skip_csi(sp)) != 0
+            && sp[csi] == 'm') {
+            len = (size_t) csi + 1;
+-           (void) strcpy(buf2, "SGR:");
+-           strcat(buf2, ecma_highlights[0].to);
++           _nc_STRCPY(buf2, "SGR:", sizeof(buf2));
++           _nc_STRCAT(buf2, ecma_highlights[0].to, sizeof(buf2));
+            expansion = buf2;
+        }
+ 
+@@ -739,7 +916,7 @@
+                expansion = "RSR";
+                len = 1;
+            } else {
+-               (void) sprintf(buf2, "1;%dr", tp_lines);
++               _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "1;%dr", tp_lines);
+                len = strlen(buf2);
+                if (strncmp(buf2, sp + csi, len) == 0)
+                    expansion = "RSR";
+@@ -750,12 +927,12 @@
+        /* now check for home-down */
+        if (!expansion
+            && (csi = skip_csi(sp)) != 0) {
+-           (void) sprintf(buf2, "%d;1H", tp_lines);
++           _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%d;1H", tp_lines);
+            len = strlen(buf2);
+            if (strncmp(buf2, sp + csi, len) == 0) {
+                expansion = "LL";
+            } else {
+-               (void) sprintf(buf2, "%dH", tp_lines);
++               _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%dH", tp_lines);
+                len = strlen(buf2);
+                if (strncmp(buf2, sp + csi, len) == 0) {
+                    expansion = "LL";
+@@ -795,12 +972,16 @@
      int i, n;
  
@@ -40016 +57465 @@
      for (n = 0; n < argc && n < MAXCOMPARE; n++) {
         if (freopen(argv[n], "r", stdin) == 0)
-@@ -974,7 +975,9 @@
+            _nc_err_abort("Can't open %s", argv[n]);
+ 
++#if NO_LEAKS
++       entered[n].head = _nc_head;
++       entered[n].tail = _nc_tail;
++#endif
+        _nc_head = _nc_tail = 0;
+ 
+        /* parse entries out of the source file */
+@@ -925,6 +1106,11 @@
+ #endif
+            if (!(entryeq(&qp->tterm, &rp->tterm) && useeq(qp, rp))) {
+                char name1[NAMESIZE], name2[NAMESIZE];
++               char *names[3];
++
++               names[0] = name1;
++               names[1] = name2;
++               names[2] = 0;
+ 
+                entries[0] = *qp;
+                entries[1] = *rp;
+@@ -934,29 +1120,17 @@
+ 
+                switch (compare) {
+                case C_DIFFERENCE:
+-                   if (itrace)
+-                       (void) fprintf(stderr,
+-                                      "%s: dumping differences\n",
+-                                      _nc_progname);
+-                   (void) printf("comparing %s to %s.\n", name1, name2);
++                   show_comparing(names);
+                    compare_entry(compare_predicate, &entries->tterm, quiet);
+                    break;
+ 
+                case C_COMMON:
+-                   if (itrace)
+-                       (void) fprintf(stderr,
+-                                      "%s: dumping common capabilities\n",
+-                                      _nc_progname);
+-                   (void) printf("comparing %s to %s.\n", name1, name2);
++                   show_comparing(names);
+                    compare_entry(compare_predicate, &entries->tterm, quiet);
+                    break;
+ 
+                case C_NAND:
+-                   if (itrace)
+-                       (void) fprintf(stderr,
+-                                      "%s: dumping differences\n",
+-                                      _nc_progname);
+-                   (void) printf("comparing %s to %s.\n", name1, name2);
++                   show_comparing(names);
+                    compare_entry(compare_predicate, &entries->tterm, quiet);
+                    break;
+ 
+@@ -974,7 +1148,9 @@
         "Usage: infocmp [options] [-A directory] [-B directory] [termname...]"
         ,""
@@ -40026 +57529 @@
         ,"  -F    compare terminfo-files"
         ,"  -I    use terminfo-names"
-@@ -1090,7 +1093,8 @@
+@@ -1030,19 +1206,23 @@
+ any_initializer(const char *fmt, const char *type)
+ {
+     static char *initializer;
++    static size_t need;
+     char *s;
+ 
+-    if (initializer == 0)
+-       initializer = (char *) malloc(strlen(entries->tterm.term_names) +
+-                                     strlen(type) + strlen(fmt));
++    if (initializer == 0) {
++       need = (strlen(entries->tterm.term_names)
++               + strlen(type)
++               + strlen(fmt));
++       initializer = (char *) malloc(need);
++    }
+ 
+-    (void) strcpy(initializer, entries->tterm.term_names);
++    _nc_STRCPY(initializer, entries->tterm.term_names, need);
+     for (s = initializer; *s != 0 && *s != '|'; s++) {
+        if (!isalnum(UChar(*s)))
+            *s = '_';
+     }
+     *s = 0;
+-    (void) sprintf(s, fmt, type);
++    _nc_SPRINTF(s, _nc_SLIMIT(need) fmt, type);
+     return initializer;
+ }
+ 
+@@ -1073,9 +1253,10 @@
+ 
+        if (VALID_STRING(term->Strings[n])) {
+            tp = buf;
++#define TP_LIMIT       ((MAX_STRING - 5) - (size_t)(tp - buf))
+            *tp++ = '"';
+            for (sp = term->Strings[n];
+-                *sp != 0 && (tp - buf) < MAX_STRING - 6;
++                *sp != 0 && TP_LIMIT > 2;
+                 sp++) {
+                if (isascii(UChar(*sp))
+                    && isprint(UChar(*sp))
+@@ -1083,14 +1264,15 @@
+                    && *sp != '"')
+                    *tp++ = *sp;
+                else {
+-                   (void) sprintf(tp, "\\%03o", UChar(*sp));
++                   _nc_SPRINTF(tp, _nc_SLIMIT(TP_LIMIT) "\\%03o", UChar(*sp));
+                    tp += 4;
+                }
+            }
             *tp++ = '"';
             *tp = '\0';
@@ -40036 +57588 @@
      }
      printf("\n");
-@@ -1116,7 +1120,7 @@
+@@ -1116,7 +1298,7 @@
             break;
         }
@@ -40045 +57597 @@
      (void) printf("%s;\n", R_CURL);
  
-@@ -1137,7 +1141,7 @@
+@@ -1132,12 +1314,12 @@
+            str = "CANCELLED_NUMERIC";
+            break;
+        default:
+-           sprintf(buf, "%d", term->Numbers[n]);
++           _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "%d", term->Numbers[n]);
+            str = buf;
             break;
         }
@@ -40054 +57612 @@
      (void) printf("%s;\n", R_CURL);
  
-@@ -1150,10 +1154,10 @@
+@@ -1150,10 +1332,10 @@
         else if (term->Strings[n] == CANCELLED_STRING)
             str = "CANCELLED_STRING";
@@ -40067 +57625 @@
      (void) printf("%s;\n", R_CURL);
  
-@@ -1165,15 +1169,15 @@
+@@ -1165,15 +1347,15 @@
                       name_initializer("string_ext"), L_CURL);
         for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
@@ -40086 +57644 @@
         (void) printf("%s;\n", R_CURL);
      }
-@@ -1247,6 +1251,23 @@
+@@ -1247,6 +1429,23 @@
      return terminal;
  }
@@ -40110 +57668 @@
   *
   * Main sequence
-@@ -1269,7 +1290,7 @@
+@@ -1269,7 +1468,7 @@
      /* Also avoid overflowing smaller stacks on systems like AmigaOS */
      path *tfile = 0;
@@ -40119 +57677 @@
      char **myargv;
  
-@@ -1287,6 +1308,7 @@
+@@ -1287,6 +1486,7 @@
  #if NCURSES_XNAMES
      use_extended_names(FALSE);
@@ -40127 +57685 @@
      _nc_progname = _nc_rootname(argv[0]);
  
-@@ -1297,8 +1319,13 @@
+@@ -1297,8 +1497,13 @@
  
      while ((c = getopt(argc,
@@ -40142 +57700 @@
             mwidth = 0;
             break;
-@@ -1317,6 +1344,9 @@
+@@ -1317,6 +1522,9 @@
             restdir = optarg;
             break;
@@ -40152 +57710 @@
             outform = F_TERMCAP;
             tversion = "BSD";
-@@ -1324,6 +1354,11 @@
+@@ -1324,6 +1532,11 @@
                 sortmode = S_TERMCAP;
             break;
@@ -40164 +57722 @@
             compare = C_COMMON;
             break;
-@@ -1441,7 +1476,7 @@
+@@ -1441,7 +1654,7 @@
             ExitProgram(EXIT_SUCCESS);
  
@@ -40173 +57731 @@
             break;
  
-@@ -1460,7 +1495,7 @@
+@@ -1460,10 +1673,13 @@
         }
      }
@@ -40182 +57740 @@
      tname = typeCalloc(char *, maxterms);
      entries = typeCalloc(ENTRY, maxterms);
-@@ -1477,7 +1512,7 @@
++#if NO_LEAKS
++    entered = typeCalloc(ENTERED, maxterms);
++#endif
+ 
+     if (tfile == 0
+        || tname == 0
+@@ -1476,9 +1692,6 @@
+     if (sortmode == S_DEFAULT)
         sortmode = S_TERMINFO;
  
-     /* set up for display */
+-    /* set up for display */
 -    dump_init(tversion, outform, sortmode, mwidth, itrace, formatted);
-+    dump_init(tversion, outform, sortmode, mwidth, mheight, itrace, formatted);
- 
+-
      /* make sure we have at least one terminal name to work with */
      if (optind >= argc)
+        argv[argc++] = terminal_env();
+@@ -1487,9 +1700,23 @@
+     if (compare != C_DEFAULT && optind >= argc - 1)
+        argv[argc++] = terminal_env();
+ 
++    /* exactly one terminal name with no options means display it */
+     /* exactly two terminal names with no options means do -d */
+-    if (argc - optind == 2 && compare == C_DEFAULT)
+-       compare = C_DIFFERENCE;
++    if (compare == C_DEFAULT) {
++       switch (argc - optind) {
++       default:
++           fprintf(stderr, "%s: too many names to compare\n", _nc_progname);
++           ExitProgram(EXIT_FAILURE);
++       case 1:
++           break;
++       case 2:
++           compare = C_DIFFERENCE;
++           break;
++       }
++    }
++
++    /* set up for display */
++    dump_init(tversion, outform, sortmode, mwidth, mheight, itrace, formatted);
+ 
+     if (!filecompare) {
+        /* grab the entries */
+@@ -1507,9 +1734,11 @@
+ #else
+ #define LEAF_FMT "%02x"
+ #endif
+-               (void) sprintf(tfile[termcount], "%s/" LEAF_FMT "/%s",
+-                              directory,
+-                              UChar(*argv[optind]), argv[optind]);
++               _nc_SPRINTF(tfile[termcount],
++                           _nc_SLIMIT(sizeof(path))
++                           "%s/" LEAF_FMT "/%s",
++                           directory,
++                           UChar(*argv[optind]), argv[optind]);
+                if (itrace)
+                    (void) fprintf(stderr,
+                                   "%s: reading entry %s from file %s\n",
+@@ -1599,27 +1828,17 @@
+                break;
+ 
+            case C_DIFFERENCE:
+-               if (itrace)
+-                   (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname);
+-               (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
++               show_comparing(tname);
+                compare_entry(compare_predicate, &entries->tterm, quiet);
+                break;
+ 
+            case C_COMMON:
+-               if (itrace)
+-                   (void) fprintf(stderr,
+-                                  "%s: dumping common capabilities\n",
+-                                  _nc_progname);
+-               (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
++               show_comparing(tname);
+                compare_entry(compare_predicate, &entries->tterm, quiet);
+                break;
+ 
+            case C_NAND:
+-               if (itrace)
+-                   (void) fprintf(stderr,
+-                                  "%s: dumping differences\n",
+-                                  _nc_progname);
+-               (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
++               show_comparing(tname);
+                compare_entry(compare_predicate, &entries->tterm, quiet);
+                break;
+ 
+@@ -1640,15 +1859,16 @@
+                break;
+            }
+        }
+-    } else if (compare == C_USEALL)
++    } else if (compare == C_USEALL) {
+        (void) fprintf(stderr, "Sorry, -u doesn't work with -F\n");
+-    else if (compare == C_DEFAULT)
++    } else if (compare == C_DEFAULT) {
+        (void) fprintf(stderr, "Use `tic -[CI] <file>' for this.\n");
+-    else if (argc - optind != 2)
++    } else if (argc - optind != 2) {
+        (void) fprintf(stderr,
+                       "File comparison needs exactly two file arguments.\n");
+-    else
++    } else {
+        file_comparison(argc - optind, argv + optind);
++    }
+ 
+     MAIN_LEAKS();
+     ExitProgram(EXIT_SUCCESS);
 diff -Naur ncurses-5.9.orig/progs/progs.priv.h ncurses-5.9/progs/progs.priv.h
---- ncurses-5.9.orig/progs/progs.priv.h 2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/progs/progs.priv.h      2012-02-16 18:25:13.011819328 +0000
+--- ncurses-5.9.orig/progs/progs.priv.h 2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/progs.priv.h      2012-08-25 19:58:00.929893713 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40206 +57864 @@
  /*
 - * $Id: progs.priv.h,v 1.34 2008/08/03 17:43:05 tom Exp $
-+ * $Id: progs.priv.h,v 1.36 2011/06/26 09:31:22 tom Exp $
++ * $Id: progs.priv.h,v 1.39 2012/02/22 22:11:27 tom Exp $
   *
   *     progs.priv.h
   *
-@@ -99,7 +99,7 @@
+@@ -42,7 +42,7 @@
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
+-#define MODULE_ID(id) /*nothing*/
++#define MODULE_ID(id)          /*nothing */
+ #endif
+ 
+ #include <stdlib.h>
+@@ -90,6 +90,14 @@
+ # endif
+ #endif
+ 
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++
+ #include <assert.h>
+ #include <errno.h>
+ 
+@@ -99,7 +107,7 @@
  
  #if HAVE_GETOPT_H
@@ -40219 +57901 @@
   * variables doesn't hurt.
   */
-@@ -109,6 +109,7 @@
+@@ -109,9 +117,11 @@
  
  #include <curses.h>
@@ -40227 +57909 @@
  #include <nc_tparm.h>
  
++#include <nc_string.h>
+ #include <nc_alloc.h>
+ #if HAVE_NC_FREEALL
+ #undef ExitProgram
+@@ -171,7 +181,7 @@
+ # elif defined(MAXPATHLEN)
+ #  define PATH_MAX MAXPATHLEN
+ # else
+-#  define PATH_MAX 255 /* the Posix minimum pathsize */
++#  define PATH_MAX 255         /* the Posix minimum pathsize */
+ # endif
+ #endif
+ 
+@@ -183,7 +193,7 @@
+ # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127)
+ #  define isascii(c) (UChar(c) <= 127)
+ # else
+-#  define isascii(c) 1 /* not really ascii anyway */
++#  define isascii(c) 1         /* not really ascii anyway */
+ # endif
+ #endif
+ 
 diff -Naur ncurses-5.9.orig/progs/tabs.c ncurses-5.9/progs/tabs.c
---- ncurses-5.9.orig/progs/tabs.c       2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/progs/tabs.c    2012-02-16 18:25:13.011819328 +0000
+--- ncurses-5.9.orig/progs/tabs.c       2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/tabs.c    2012-08-25 19:58:00.929893713 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40242 +57946 @@
  
 -MODULE_ID("$Id: tabs.c,v 1.19 2010/10/23 22:26:01 tom Exp $")
-+MODULE_ID("$Id: tabs.c,v 1.21 2011/05/21 18:31:21 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.23 2012/02/22 23:57:44 tom Exp $")
  
  static void usage(void) GCC_NORETURN;
  
-@@ -227,7 +227,7 @@
+@@ -140,10 +140,11 @@
+     for (n = 0; n < max_cols; n += 10) {
+        int ch = 1 + (n / 10);
+        char buffer[20];
+-       sprintf(buffer, "----+----%c",
+-               ((ch < 10)
+-                ? (ch + '0')
+-                : (ch + 'A' - 10)));
++       _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
++                   "----+----%c",
++                   ((ch < 10)
++                    ? (ch + '0')
++                    : (ch + 'A' - 10)));
+        printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer);
+     }
+     putchar('\n');
+@@ -227,7 +228,7 @@
      bool result = FALSE;
  
@@ -40255 +57975 @@
             result = (source[len - 1] != ',');
      } else {
-@@ -251,7 +251,7 @@
+@@ -251,7 +252,7 @@
  
      if (copied != 0 && *copied != '\0') {
@@ -40264 +57984 @@
         if (*copied == ',')
             comma = "";
-@@ -353,7 +353,6 @@
+@@ -266,11 +267,11 @@
+        if (result != 0) {
+            *result = '\0';
+            if (*append != 0) {
+-               strcpy(result, *append);
++               _nc_STRCPY(result, *append, need);
+                free(*append);
+            }
+-           strcat(result, comma);
+-           strcat(result, copied);
++           _nc_STRCAT(result, comma, need);
++           _nc_STRCAT(result, copied, need);
+        }
+ 
+        *append = result;
+@@ -353,7 +354,6 @@
      bool no_op = FALSE;
      int n, ch;
@@ -40272 +58007 @@
      const char *tab_list = 0;
  
-@@ -446,7 +445,11 @@
+@@ -446,7 +446,11 @@
             while ((ch = *++option) != '\0') {
                 switch (ch) {
@@ -40286 +58021 @@
                     /* special case of relative stops separated by spaces? */
 diff -Naur ncurses-5.9.orig/progs/tic.c ncurses-5.9/progs/tic.c
---- ncurses-5.9.orig/progs/tic.c        2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/progs/tic.c     2012-02-16 18:25:13.243825451 +0000
+--- ncurses-5.9.orig/progs/tic.c        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/progs/tic.c     2012-08-25 19:58:01.529890874 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40303 +58038 @@
   */
  
-@@ -42,9 +43,10 @@
+@@ -42,9 +43,12 @@
  #include <sys/stat.h>
  
@@ -40311 +58046 @@
  
 -MODULE_ID("$Id: tic.c,v 1.147 2011/02/12 18:39:08 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.160 2012/02/05 01:39:39 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.177 2012/06/02 17:19:31 tom Exp $")
++
++#define STDIN_NAME "<stdin>"
  
  const char *_nc_progname = "tic";
  
-@@ -69,11 +71,13 @@
+@@ -53,6 +57,7 @@
+ static bool capdump = FALSE;   /* running as infotocap? */
+ static bool infodump = FALSE;  /* running as captoinfo? */
+ static bool showsummary = FALSE;
++static char **namelst = 0;
+ static const char *to_remove;
+ 
+ static void (*save_check_termtype) (TERMTYPE *, bool);
+@@ -69,11 +74,13 @@
  1\
  a\
@@ -40329 +58074 @@
  N\
  r\
-@@ -133,7 +137,9 @@
+@@ -99,7 +106,7 @@
+ #endif
+ 
+ static void
+-cleanup(char **namelst GCC_UNUSED)
++cleanup(void)
+ {
+ #if NO_LEAKS
+     free_namelist(namelst);
+@@ -119,7 +126,6 @@
+ failed(const char *msg)
+ {
+     perror(msg);
+-    cleanup((char **) 0);
+     ExitProgram(EXIT_FAILURE);
+ }
+ 
+@@ -133,7 +139,9 @@
  #if NCURSES_XNAMES
         "  -a         retain commented-out capabilities (sets -x also)",
@@ -40339 +58101 @@
         "  -e<names>  translate/compile only entries named by comma-separated list",
         "  -f         format complex strings for readability",
-@@ -173,7 +179,7 @@
+@@ -173,7 +181,7 @@
  
  #define L_BRACE '{'
@@ -40348 +58110 @@
  static void
  write_it(ENTRY * ep)
-@@ -221,7 +227,7 @@
+@@ -216,12 +224,12 @@
+            }
+            *d = 0;
+            if (strlen(result) < strlen(s))
+-               strcpy(s, result);
++               _nc_STRCPY(s, result, strlen(s) + 1);
+        }
      }
  
@@ -40357 +58125 @@
  }
  
-@@ -339,23 +345,23 @@
+@@ -308,7 +316,7 @@
+            if ((up = strchr(namebuf, '#')) != 0
+                || (up = strchr(namebuf, '=')) != 0
+                || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {
+-               (void) strcpy(suffix, up);
++               _nc_STRCPY(suffix, up, have);
+                *up = '\0';
+            }
+ 
+@@ -339,39 +347,116 @@
  static char *
  stripped(char *src)
@@ -40373 +58150 @@
 +       if ((dst = strdup(src)) == NULL) {
             failed("strdup");
--
--       assert(dst != 0);
--
--       len = strlen(dst);
--       while (--len != 0 && isspace(UChar(dst[len])))
--           dst[len] = '\0';
--       return dst;
 +       } else {
 +           len = strlen(dst);
@@ -40385 +58155 @@
 +               dst[len] = '\0';
 +       }
++    }
++    return dst;
++}
++
++static FILE *
++open_tempfile(char *filename)
++{
++    FILE *result = 0;
++
++    _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX);
++#if HAVE_MKSTEMP
++    {
++       int fd = mkstemp(filename);
++       if (fd >= 0)
++           result = fdopen(fd, "w");
++    }
++#else
++    if (tmpnam(filename) != 0)
++       result = fopen(filename, "w");
++#endif
++    return result;
++}
+ 
+-       assert(dst != 0);
++static FILE *
++copy_input(FILE *source, const char *filename, char *alt_file)
++{
++    FILE *result = 0;
++    FILE *target = open_tempfile(alt_file);
++    int ch;
+ 
+-       len = strlen(dst);
+-       while (--len != 0 && isspace(UChar(dst[len])))
+-           dst[len] = '\0';
+-       return dst;
++    if (source == 0) {
++       failed("copy_input (source)");
++    } else if (target == 0) {
++       failed("copy_input (target)");
++    } else {
++       clearerr(source);
++       for (;;) {
++           ch = fgetc(source);
++           if (feof(source)) {
++               break;
++           } else if (ferror(source)) {
++               failed(filename);
++           } else if (ch == 0) {
++               /* don't loop in case someone wants to convert /dev/zero */
++               fprintf(stderr, "%s: %s is not a text-file\n", _nc_progname, filename);
++               ExitProgram(EXIT_FAILURE);
++           }
++           fputc(ch, target);
++       }
++       fclose(source);
++       /*
++        * rewind() does not force the target file's data to disk (not does
++        * fflush()...).  So open a second stream on the data and then close
++        * the one that we were writing on before starting to read from the
++        * second stream.
++        */
++       result = fopen(alt_file, "r+");
++       fclose(target);
++       to_remove = alt_file;
      }
 -    return 0;
-+    return dst;
++    return result;
  }
  
  static FILE *
-@@ -471,11 +477,113 @@
-     return result;
+-open_input(const char *filename)
++open_input(const char *filename, char *alt_file)
+ {
+-    FILE *fp = fopen(filename, "r");
++    FILE *fp;
+     struct stat sb;
++    int mode;
+ 
+-    if (fp == 0) {
+-       fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
++    if (!strcmp(filename, "-")) {
++       fp = copy_input(stdin, STDIN_NAME, alt_file);
++    } else if (stat(filename, &sb) < 0) {
++       fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno));
+        ExitProgram(EXIT_FAILURE);
+-    }
+-    if (fstat(fileno(fp), &sb) < 0
+-       || (sb.st_mode & S_IFMT) != S_IFREG) {
++    } else if ((mode = (sb.st_mode & S_IFMT)) == S_IFDIR
++              || (mode != S_IFREG && mode != S_IFCHR)) {
+        fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
+        ExitProgram(EXIT_FAILURE);
++    } else {
++       fp = fopen(filename, "r");
++
++       if (fp == 0) {
++           fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
++           ExitProgram(EXIT_FAILURE);
++       }
++       if (mode != S_IFREG) {
++           if (alt_file != 0) {
++               FILE *fp2 = copy_input(fp, filename, alt_file);
++               fp = fp2;
++           } else {
++               fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
++               ExitProgram(EXIT_FAILURE);
++           }
++       }
+     }
+     return fp;
  }
- 
+@@ -389,7 +474,7 @@
+     if (src == 0) {
+        /* EMPTY */ ;
+     } else if (strchr(src, '/') != 0) {                /* a filename */
+-       FILE *fp = open_input(src);
++       FILE *fp = open_input(src, (char *) 0);
+ 
+        for (pass = 1; pass <= 2; pass++) {
+            nn = 0;
+@@ -456,26 +541,114 @@
+     return (code);
+ }
+ 
+-static FILE *
+-open_tempfile(char *name)
 +static const char *
 +valid_db_path(const char *nominal)
-+{
+ {
+-    FILE *result = 0;
+-#if HAVE_MKSTEMP
+-    int fd = mkstemp(name);
+-    if (fd >= 0)
+-       result = fdopen(fd, "w");
 +    struct stat sb;
 +#if USE_HASHED_DB
@@ -40404 +58295 @@
 +    char *result = malloc(need);
 +
-+    strcpy(result, nominal);
++    _nc_STRCPY(result, nominal, need);
 +    if (strcmp(result + need - sizeof(suffix), suffix)) {
-+       strcat(result, suffix);
++       _nc_STRCAT(result, suffix, need);
 +    }
-+#else
+ #else
+-    if (tmpnam(name) != 0)
+-       result = fopen(name, "w");
 +    char *result = strdup(nominal);
 +#endif
@@ -40428 +58321 @@
 +           result = 0;
 +       }
-+#endif
+ #endif
 +    } else {
 +       /* check if parent is directory and is writable */
@@ -40452 +58345 @@
 +       }
 +    }
-+    return result;
-+}
-+
+     return result;
+ }
+ 
 +/*
 + * Show the databases to which tic could write.  The location to which it
@@ -40501 +58394 @@
      char my_tmpname[PATH_MAX];
 -    int v_opt = -1, debug_level;
++    char my_altfile[PATH_MAX];
 +    int v_opt = -1;
 +    unsigned debug_level;
@@ -40506 +58400 @@
      char *termcap;
      ENTRY *qp;
-@@ -486,6 +594,7 @@
+@@ -486,6 +659,7 @@
      int sortmode = S_TERMINFO; /* sort_mode */
  
@@ -40514 +58408 @@
      bool literal = FALSE;      /* suppress post-processing? */
      int numbers = 0;           /* format "%'char'" to/from "%{number}" */
-@@ -513,6 +622,7 @@
+@@ -493,7 +667,6 @@
+     bool limited = TRUE;
+     char *tversion = (char *) NULL;
+     const char *source_file = "terminfo";
+-    char **namelst = 0;
+     char *outdir = (char *) NULL;
+     bool check_only = FALSE;
+     bool suppress_untranslatable = FALSE;
+@@ -501,6 +674,7 @@
+     log_fp = stderr;
+ 
+     _nc_progname = _nc_rootname(argv[0]);
++    atexit(cleanup);
+ 
+     if ((infodump = same_program(_nc_progname, PROG_CAPTOINFO)) != FALSE) {
+        outform = F_TERMINFO;
+@@ -513,6 +687,7 @@
  #if NCURSES_XNAMES
      use_extended_names(FALSE);
@@ -40522 +58432 @@
      /*
       * Processing arguments is a little complicated, since someone made a
-@@ -520,7 +630,7 @@
+@@ -520,7 +695,7 @@
       * be optional.
       */
@@ -40531 +58441 @@
             switch (last_opt) {
             case 'v':
-@@ -530,19 +640,40 @@
+@@ -530,19 +705,40 @@
                 width = (width * 10) + (this_opt - '0');
                 break;
@@ -40575 +58485 @@
             infodump = TRUE;
             outform = F_TERMINFO;
-@@ -618,7 +749,7 @@
+@@ -568,7 +764,6 @@
+            break;
+        case 'V':
+            puts(curses_version());
+-           cleanup(namelst);
+            ExitProgram(EXIT_SUCCESS);
+        case 'c':
+            check_only = TRUE;
+@@ -618,7 +813,7 @@
         last_opt = this_opt;
      }
@@ -40584 +58502 @@
  
      if (_nc_tracing) {
-@@ -638,7 +769,8 @@
+@@ -638,8 +833,8 @@
       */
      if (namelst && (!infodump && !capdump)) {
         (void) fprintf(stderr,
 -                      "Sorry, -e can't be used without -I or -C\n");
+-       cleanup(namelst);
 +                      "%s: Sorry, -e can't be used without -I or -C\n",
 +                      _nc_progname);
-        cleanup(namelst);
         ExitProgram(EXIT_FAILURE);
      }
-@@ -695,11 +827,11 @@
+ #endif /* HAVE_BIG_CORE */
+@@ -663,16 +858,16 @@
+                if (access(termcap, F_OK) == 0) {
+                    /* file exists */
+                    source_file = termcap;
+-               } else if ((tmp_fp = open_tempfile(strcpy(my_tmpname,
+-                                                         "/tmp/XXXXXX")))
+-                          != 0) {
+-                   source_file = my_tmpname;
+-                   fprintf(tmp_fp, "%s\n", termcap);
+-                   fclose(tmp_fp);
+-                   tmp_fp = open_input(source_file);
+-                   to_remove = source_file;
+                } else {
+-                   failed("tmpnam");
++                   if ((tmp_fp = open_tempfile(my_tmpname)) != 0) {
++                       source_file = my_tmpname;
++                       fprintf(tmp_fp, "%s\n", termcap);
++                       fclose(tmp_fp);
++                       tmp_fp = open_input(source_file, (char *) 0);
++                       to_remove = source_file;
++                   } else {
++                       failed("tmpnam");
++                   }
+                }
+            }
+        } else {
+@@ -682,24 +877,28 @@
+                    _nc_progname,
+                    _nc_progname,
+                    usage_string);
+-           cleanup(namelst);
+            ExitProgram(EXIT_FAILURE);
+        }
+     }
+ 
+-    if (tmp_fp == 0)
+-       tmp_fp = open_input(source_file);
++    if (tmp_fp == 0) {
++       tmp_fp = open_input(source_file, my_altfile);
++       if (!strcmp(source_file, "-")) {
++           source_file = STDIN_NAME;
++       }
++    }
+ 
+-    if (infodump)
++    if (infodump) {
+        dump_init(tversion,
                   smart_defaults
                   ? outform
                   : F_LITERAL,
 -                 sortmode, width, debug_level, formatted);
+-    else if (capdump)
 +                 sortmode, width, height, debug_level, formatted);
-     else if (capdump)
++    } else if (capdump) {
         dump_init(tversion,
                   outform,
 -                 sortmode, width, debug_level, FALSE);
 +                 sortmode, width, height, debug_level, FALSE);
++    }
  
      /* parse entries out of the source file */
      _nc_set_source(source_file);
-@@ -750,7 +882,7 @@
+@@ -716,7 +915,6 @@
+     /* do use resolution */
+     if (check_only || (!infodump && !capdump) || forceresolve) {
+        if (!_nc_resolve_uses2(TRUE, literal) && !check_only) {
+-           cleanup(namelst);
+            ExitProgram(EXIT_FAILURE);
+        }
+     }
+@@ -750,7 +948,7 @@
  
             for_entry_list(qp) {
@@ -40617 +58592 @@
  
                     /* this is in case infotocap() generates warnings */
-@@ -767,7 +899,7 @@
+@@ -767,7 +965,7 @@
                     repair_acsc(&qp->tterm);
                     dump_entry(&qp->tterm, suppress_untranslatable,
@@ -40626 +58601 @@
                     len = show_entry();
                     if (debug_level != 0 && !limited)
-@@ -915,18 +1047,18 @@
+@@ -811,7 +1009,6 @@
+        else
+            fprintf(log_fp, "No entries written\n");
+     }
+-    cleanup(namelst);
+     ExitProgram(EXIT_SUCCESS);
+ }
+ 
+@@ -915,18 +1112,18 @@
      return result;
  }
@@ -40648 +58631 @@
      return result;
  }
-@@ -1097,11 +1229,11 @@
+@@ -1015,13 +1212,18 @@
+     int count;
+     char *list[4];
+ 
++    /* it is rare to have an insert-line feature without a matching delete */
++    ANDMISSING(parm_insert_line, insert_line);
++    ANDMISSING(parm_delete_line, delete_line);
++    ANDMISSING(parm_insert_line, parm_delete_line);
++
+     /* if we have a parameterized form, then the non-parameterized is easy */
+     ANDMISSING(parm_down_cursor, cursor_down);
+     ANDMISSING(parm_up_cursor, cursor_up);
+     ANDMISSING(parm_left_cursor, cursor_left);
+     ANDMISSING(parm_right_cursor, cursor_right);
+ 
+-    /* Given any of a set of cursor movement, the whole set should be present. 
++    /* Given any of a set of cursor movement, the whole set should be present.
+      * Technically this is not true (we could use cursor_address to fill in
+      * unsupported controls), but it is likely.
+      */
+@@ -1097,11 +1299,11 @@
         VALID_STRING(key_c1) &&
         VALID_STRING(key_c3)) {
@@ -40663 +58666 @@
         final[0] = keypad_final(key_a1);
         final[1] = keypad_final(key_a3);
-@@ -1592,7 +1724,7 @@
-     for (j = 0; j < NUM_STRINGS(tp); j++) {
+@@ -1149,19 +1351,19 @@
+                assert(strlen(show) < (MAX_KP * 4));
+                switch (kk) {
+                case 0:
+-                   strcat(show, " ka1");
++                   _nc_STRCAT(show, " ka1", sizeof(show));
+                    break;
+                case 1:
+-                   strcat(show, " ka3");
++                   _nc_STRCAT(show, " ka3", sizeof(show));
+                    break;
+                case 2:
+-                   strcat(show, " kb2");
++                   _nc_STRCAT(show, " kb2", sizeof(show));
+                    break;
+                case 3:
+-                   strcat(show, " kc1");
++                   _nc_STRCAT(show, " kc1", sizeof(show));
+                    break;
+                case 4:
+-                   strcat(show, " kc3");
++                   _nc_STRCAT(show, " kc3", sizeof(show));
+                    break;
+                }
+            }
+@@ -1176,18 +1378,24 @@
+               VALID_STRING(key_c3)) {
+        show[0] = '\0';
+        if (keypad_index(key_a1) >= 0)
+-           strcat(show, " ka1");
++           _nc_STRCAT(show, " ka1", sizeof(show));
+        if (keypad_index(key_a3) >= 0)
+-           strcat(show, " ka3");
++           _nc_STRCAT(show, " ka3", sizeof(show));
+        if (keypad_index(key_b2) >= 0)
+-           strcat(show, " kb2");
++           _nc_STRCAT(show, " kb2", sizeof(show));
+        if (keypad_index(key_c1) >= 0)
+-           strcat(show, " kc1");
++           _nc_STRCAT(show, " kc1", sizeof(show));
+        if (keypad_index(key_c3) >= 0)
+-           strcat(show, " kc3");
++           _nc_STRCAT(show, " kc3", sizeof(show));
+        if (*show != '\0')
+            _nc_warning("vt100 keypad map incomplete:%s", show);
+     }
++
++    /*
++     * These warnings are useful for consistency checks - it is possible that
++     * there are real terminals with mismatches in these 
++     */
++    ANDMISSING(key_ic, key_dc);
+ }
+ 
+ static void
+@@ -1216,6 +1424,72 @@
+     ANDMISSING(parm_up_micro, micro_up);
+ }
+ 
++static bool
++uses_SGR_39_49(const char *value)
++{
++    return (strstr(value, "39;49") != 0
++           || strstr(value, "49;39") != 0);
++}
++
++/*
++ * Check consistency of termcap extensions related to "screen".
++ */
++static void
++check_screen(TERMTYPE *tp)
++{
++    if (_nc_user_definable) {
++       int have_XT = tigetflag("XT");
++       int have_XM = tigetflag("XM");
++       int have_bce = back_color_erase;
++       bool have_kmouse = FALSE;
++       bool use_sgr_39_49 = FALSE;
++       char *name = _nc_first_name(tp->term_names);
++
++       if (!VALID_BOOLEAN(have_bce)) {
++           have_bce = FALSE;
++       }
++       if (!VALID_BOOLEAN(have_XM)) {
++           have_XM = FALSE;
++       }
++       if (!VALID_BOOLEAN(have_XT)) {
++           have_XT = FALSE;
++       }
++       if (VALID_STRING(key_mouse)) {
++           have_kmouse = !strcmp("\033[M", key_mouse);
++       }
++       if (VALID_STRING(orig_colors)) {
++           use_sgr_39_49 = uses_SGR_39_49(orig_colors);
++       } else if (VALID_STRING(orig_pair)) {
++           use_sgr_39_49 = uses_SGR_39_49(orig_pair);
++       }
++
++       if (have_XM && have_XT) {
++           _nc_warning("Screen's XT capability conflicts with XM");
++       } else if (have_XT
++                  && strstr(name, "screen") != 0
++                  && strchr(name, '.') != 0) {
++           _nc_warning("Screen's \"screen\" entries should not have XT set");
++       } else if (have_XT) {
++           if (!have_kmouse && have_bce) {
++               if (VALID_STRING(key_mouse)) {
++                   _nc_warning("Value of kmous inconsistent with screen's usage");
++               } else {
++                   _nc_warning("Expected kmous capability with XT");
++               }
++           }
++           if (!have_bce && max_colors > 0)
++               _nc_warning("Expected bce capability with XT");
++           if (!use_sgr_39_49 && have_bce && max_colors > 0)
++               _nc_warning("Expected orig_colors capability with XT to have 39/49 parameters");
++           if (VALID_STRING(to_status_line))
++               _nc_warning("\"tsl\" capability is redundant, given XT");
++       } else {
++           if (have_kmouse && !have_XM)
++               _nc_warning("Expected XT to be set, given kmous");
++       }
++    }
++}
++
+ /*
+  * Returns the expected number of parameters for the given capability.
+  */
+@@ -1527,7 +1801,7 @@
+ show_where(unsigned level)
+ {
+     if (_nc_tracing >= DEBUG_LEVEL(level)) {
+-       char my_name[256];
++       char my_name[MAX_NAME_SIZE];
+        _nc_get_type(my_name);
+        _tracef("\"%s\", line %d, '%s'",
+                _nc_get_source(),
+@@ -1539,6 +1813,55 @@
+ #define show_where(level)      /* nothing */
+ #endif
+ 
++typedef struct {
++    int keycode;
++    const char *name;
++    const char *value;
++} NAME_VALUE;
++
++static NAME_VALUE *
++get_fkey_list(TERMTYPE *tp)
++{
++    NAME_VALUE *result = typeMalloc(NAME_VALUE, NUM_STRINGS(tp) + 1);
++    const struct tinfo_fkeys *all_fkeys = _nc_tinfo_fkeys;
++    int used = 0;
++    int j;
++
++    for (j = 0; all_fkeys[j].code; j++) {
++       char *a = tp->Strings[all_fkeys[j].offset];
++       if (VALID_STRING(a)) {
++           result[used].keycode = (int) all_fkeys[j].code;
++           result[used].name = strnames[all_fkeys[j].offset];
++           result[used].value = a;
++           ++used;
++       }
++    }
++#if NCURSES_XNAMES
++    for (j = STRCOUNT; j < NUM_STRINGS(tp); ++j) {
++       const char *name = ExtStrname(tp, j, strnames);
++       if (*name == 'k') {
++           result[used].keycode = -1;
++           result[used].name = name;
++           result[used].value = tp->Strings[j];
++           ++used;
++       }
++    }
++#endif
++    result[used].keycode = 0;
++    return result;
++}
++
++static void
++show_fkey_name(NAME_VALUE * data)
++{
++    if (data->keycode > 0) {
++       fprintf(stderr, " %s", keyname(data->keycode));
++       fprintf(stderr, " (capability \"%s\")", data->name);
++    } else {
++       fprintf(stderr, " capability \"%s\"", data->name);
++    }
++}
++
+ /* other sanity-checks (things that we don't want in the normal
+  * logic that reads a terminfo entry)
+  */
+@@ -1547,7 +1870,6 @@
+ {
+     bool conflict = FALSE;
+     unsigned j, k;
+-    char fkeys[STRCOUNT];
+ 
+     /*
+      * A terminal entry may contain more than one keycode assigned to
+@@ -1555,44 +1877,47 @@
+      * return one (the last one assigned).
+      */
+     if (!(_nc_syntax == SYN_TERMCAP && capdump)) {
+-       memset(fkeys, 0, sizeof(fkeys));
+-       for (j = 0; _nc_tinfo_fkeys[j].code; j++) {
+-           char *a = tp->Strings[_nc_tinfo_fkeys[j].offset];
++       char *check = calloc((size_t) (NUM_STRINGS(tp) + 1), sizeof(char));
++       NAME_VALUE *given = get_fkey_list(tp);
++
++       for (j = 0; given[j].keycode; ++j) {
++           const char *a = given[j].value;
+            bool first = TRUE;
+-           if (!VALID_STRING(a))
+-               continue;
+-           for (k = j + 1; _nc_tinfo_fkeys[k].code; k++) {
+-               char *b = tp->Strings[_nc_tinfo_fkeys[k].offset];
+-               if (!VALID_STRING(b)
+-                   || fkeys[k])
++
++           for (k = j + 1; given[k].keycode; k++) {
++               const char *b = given[k].value;
++               if (check[k])
+                    continue;
+                if (!_nc_capcmp(a, b)) {
+-                   fkeys[j] = 1;
+-                   fkeys[k] = 1;
++                   check[j] = 1;
++                   check[k] = 1;
+                    if (first) {
+                        if (!conflict) {
+                            _nc_warning("Conflicting key definitions (using the last)");
+                            conflict = TRUE;
+                        }
+-                       fprintf(stderr, "... %s is the same as %s",
+-                               keyname((int) _nc_tinfo_fkeys[j].code),
+-                               keyname((int) _nc_tinfo_fkeys[k].code));
++                       fprintf(stderr, "...");
++                       show_fkey_name(given + j);
++                       fprintf(stderr, " is the same as");
++                       show_fkey_name(given + k);
+                        first = FALSE;
+                    } else {
+-                       fprintf(stderr, ", %s",
+-                               keyname((int) _nc_tinfo_fkeys[k].code));
++                       fprintf(stderr, ", ");
++                       show_fkey_name(given + k);
+                    }
+                }
+            }
+            if (!first)
+                fprintf(stderr, "\n");
+        }
++       free(given);
++       free(check);
+     }
+ 
+-    for (j = 0; j < NUM_STRINGS(tp); j++) {
++    for_each_string(j, tp) {
         char *a = tp->Strings[j];
         if (VALID_STRING(a))
@@ -40672 +58933 @@
  
      check_acs(tp);
+@@ -1600,6 +1925,7 @@
+     check_cursor(tp);
+     check_keypad(tp);
+     check_printer(tp);
++    check_screen(tp);
+ 
+     /*
+      * These may be mismatched because the terminal description relies on
 diff -Naur ncurses-5.9.orig/progs/toe.c ncurses-5.9/progs/toe.c
---- ncurses-5.9.orig/progs/toe.c        2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/progs/toe.c     2012-02-16 18:25:13.059820594 +0000
+--- ncurses-5.9.orig/progs/toe.c        2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/toe.c     2012-08-25 19:58:02.026555193 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40687 +58956 @@
  
 -MODULE_ID("$Id: toe.c,v 1.52 2010/05/01 22:04:08 tom Exp $")
-+MODULE_ID("$Id: toe.c,v 1.64 2012/01/01 02:56:17 tom Exp $")
++MODULE_ID("$Id: toe.c,v 1.68 2012/07/21 22:55:59 tom Exp $")
  
  #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
@@ -40865 +59134 @@
  static bool
  make_db_name(char *dst, const char *src, unsigned limit)
-@@ -91,51 +246,80 @@
+@@ -81,61 +236,91 @@
+ 
+     if (need <= limit) {
+        if (size >= lens
+-           && !strcmp(src + size - lens, suffix))
+-           (void) strcpy(dst, src);
+-       else
+-           (void) sprintf(dst, "%s%s", src, suffix);
++           && !strcmp(src + size - lens, suffix)) {
++           _nc_STRCPY(dst, src, PATH_MAX);
++       } else {
++           _nc_SPRINTF(dst, _nc_SLIMIT(PATH_MAX) "%s%s", src, suffix);
++       }
+        result = TRUE;
+     }
+     return result;
  }
  #endif
@@ -40927 +59211 @@
 +
 +    for (i = 0; i < NUM_BOOLEANS(tp); i++) {
-+       result += (tp->Booleans[i]);
++       result += (unsigned long) (tp->Booleans[i]);
      }
 -#endif
@@ -40941 +59225 @@
 -       }
 +    for (i = 0; i < NUM_NUMBERS(tp); i++) {
-+       result += (tp->Numbers[i]);
++       result += (unsigned long) (tp->Numbers[i]);
 +    }
 +    for (i = 0; i < NUM_STRINGS(tp); i++) {
@@ -40957 +59241 @@
  {
 -    const char *desc;
-+    TERMDATA *data = new_termdata();
- 
+-
 -    if ((desc = strrchr(tp->term_names, '|')) == 0 || *++desc == '\0')
 -       desc = "(No description)";
--
++    TERMDATA *data = new_termdata();
+ 
 -    (void) printf("%-10s\t%s\n", cn, desc);
 +    data->db_index = db_index;
@@ -40977 +59261 @@
      TERMTYPE data;
      char *next = strchr(buffer, ':');
-@@ -149,10 +333,11 @@
+@@ -149,20 +334,36 @@
      if (last)
         ++last;
@@ -40991 +59275 @@
      }
      free(data.term_names);
-@@ -162,7 +347,7 @@
+ }
+ #endif
+ 
++#if USE_DATABASE
++static char *
++copy_entryname(DIRENT * src)
++{
++    size_t len = NAMLEN(src);
++    char *result = malloc(len + 1);
++    if (result == 0)
++       failed("copy entryname");
++    memcpy(result, src->d_name, len);
++    result[len] = '\0';
++
++    return result;
++}
++#endif
++
  static int
  typelist(int eargc, char *eargv[],
@@ -41000 +59301 @@
  {
      int i;
-@@ -179,8 +364,10 @@
+@@ -179,28 +380,35 @@
                 (void) fprintf(stderr,
                                "%s: can't open terminfo directory %s\n",
@@ -41013 +59314 @@
  
             while ((subdir = readdir(termdir)) != 0) {
-@@ -233,7 +420,7 @@
+-               size_t len = NAMLEN(subdir);
+-               size_t cwd_len = len + strlen(eargv[i]) + 3;
+-               char name_1[PATH_MAX];
++               size_t cwd_len;
++               char *name_1;
+                DIR *entrydir;
+                DIRENT *entry;
+ 
++               name_1 = copy_entryname(subdir);
++               if (isDotname(name_1)) {
++                   free(name_1);
++                   continue;
++               }
++
++               cwd_len = NAMLEN(subdir) + strlen(eargv[i]) + 3;
+                cwd_buf = typeRealloc(char, cwd_len, cwd_buf);
+                if (cwd_buf == 0)
+                    failed("realloc cwd_buf");
+ 
+                assert(cwd_buf != 0);
+ 
+-               strncpy(name_1, subdir->d_name, len)[len] = '\0';
+-               if (isDotname(name_1))
+-                   continue;
++               _nc_SPRINTF(cwd_buf, _nc_SLIMIT(cwd_len)
++                           "%s/%s/", eargv[i], name_1);
++               free(name_1);
+ 
+-               (void) sprintf(cwd_buf, "%s/%.*s/", eargv[i], (int) len, name_1);
+                if (chdir(cwd_buf) != 0)
+                    continue;
+ 
+@@ -210,15 +418,16 @@
+                    continue;
+                }
+                while ((entry = readdir(entrydir)) != 0) {
+-                   char name_2[PATH_MAX];
++                   char *name_2;
+                    TERMTYPE lterm;
+                    char *cn;
+                    int status;
+ 
+-                   len = NAMLEN(entry);
+-                   strncpy(name_2, entry->d_name, len)[len] = '\0';
+-                   if (isDotname(name_2) || !_nc_is_file_path(name_2))
++                   name_2 = copy_entryname(entry);
++                   if (isDotname(name_2) || !_nc_is_file_path(name_2)) {
++                       free(name_2);
+                        continue;
++                   }
+ 
+                    status = _nc_read_file_entry(name_2, &lterm);
+                    if (status <= 0) {
+@@ -226,6 +435,7 @@
+                        (void) fprintf(stderr,
+                                       "%s: couldn't open terminfo file %s.\n",
+                                       _nc_progname, name_2);
++                       free(name_2);
+                        return (EXIT_FAILURE);
+                    }
+ 
+@@ -233,21 +443,26 @@
                     cn = _nc_first_name(lterm.term_names);
                     if (!strcmp(cn, name_2)) {
@@ -41021 +59383 @@
                     }
                     _nc_free_termtype(&lterm);
++                   free(name_2);
                 }
-@@ -242,12 +429,16 @@
+                closedir(entrydir);
+            }
             closedir(termdir);
             if (cwd_buf != 0)
@@ -41039 +59403 @@
                 if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
                     DBT key, data;
-@@ -265,7 +456,7 @@
+@@ -265,7 +480,7 @@
                                 /* only visit things once, by primary name */
                                 cn = _nc_first_name(lterm.term_names);
@@ -41048 +59412 @@
                             }
                         }
-@@ -273,6 +464,7 @@
+@@ -273,6 +488,7 @@
                     }
  
@@ -41056 +59420 @@
             }
         }
-@@ -280,37 +472,43 @@
+@@ -280,37 +496,43 @@
  #endif
  #if USE_TERMCAP
@@ -41113 +59477 @@
                 fclose(fp);
             }
-@@ -319,13 +517,18 @@
+@@ -319,13 +541,18 @@
  #endif
      }
@@ -41133 +59497 @@
  }
  
-@@ -340,23 +543,24 @@
+@@ -340,23 +567,24 @@
      unsigned i;
      int code;
@@ -41162 +59526 @@
             }
             continue;
-@@ -368,6 +572,9 @@
+@@ -368,6 +596,9 @@
         case 'h':
             header = TRUE;
@@ -41172 +59536 @@
             direct_dependencies = TRUE;
             report_file = optarg;
-@@ -450,7 +657,7 @@
+@@ -450,7 +681,7 @@
       * If we get this far, user wants a simple terminal type listing.
       */
@@ -41181 +59545 @@
         DBDIRS state;
         int offset;
-@@ -460,64 +667,37 @@
+@@ -460,64 +691,37 @@
  
         code = EXIT_FAILURE;
@@ -41259 +59623 @@
      _nc_last_db();
  
+diff -Naur ncurses-5.9.orig/progs/tput.c ncurses-5.9/progs/tput.c
+--- ncurses-5.9.orig/progs/tput.c       2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/progs/tput.c    2012-08-25 19:58:00.836560821 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -47,7 +47,7 @@
+ #endif
+ #include <transform.h>
+ 
+-MODULE_ID("$Id: tput.c,v 1.46 2010/01/09 16:53:24 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.48 2012/02/18 21:51:17 tom Exp $")
+ 
+ #define PUTS(s)                fputs(s, stdout)
+ #define PUTCHAR(c)     putchar(c)
+@@ -94,9 +94,6 @@
+  * Lookup the type of call we should make to tparm().  This ignores the actual
+  * terminfo capability (bad, because it is not extensible), but makes this
+  * code portable to platforms where sizeof(int) != sizeof(char *).
+- *
+- * FIXME: If we want extensibility, analyze the capability string as we do
+- * in tparm() to decide how to parse the varargs list.
+  */
+ static TParams
+ tparm_type(const char *name)
+@@ -338,7 +335,7 @@
+            case Numbers:
+            default:
+                (void) _nc_tparm_analyze(s, p_is_s, &popcount);
+-#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n])
++#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
+                s = TPARM_9(s,
+                            myParam(1),
+                            myParam(2),
 diff -Naur ncurses-5.9.orig/progs/transform.c ncurses-5.9/progs/transform.c
---- ncurses-5.9.orig/progs/transform.c  2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/progs/transform.c       2012-02-16 18:25:13.011819328 +0000
+--- ncurses-5.9.orig/progs/transform.c  2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/transform.c       2012-08-25 19:58:00.063231144 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -41308 +59710 @@
      trim_suffix(b, &len_b);
 diff -Naur ncurses-5.9.orig/progs/tset.c ncurses-5.9/progs/tset.c
---- ncurses-5.9.orig/progs/tset.c       2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/progs/tset.c    2012-02-16 18:25:13.215824712 +0000
+--- ncurses-5.9.orig/progs/tset.c       2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/progs/tset.c    2012-08-25 19:58:00.929893713 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -41322 +59724 @@
  
 -MODULE_ID("$Id: tset.c,v 1.82 2010/05/01 21:42:46 tom Exp $")
-+MODULE_ID("$Id: tset.c,v 1.87 2012/01/21 23:55:05 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.89 2012/02/22 22:50:47 tom Exp $")
  
  /*
@@ -41348 +59750 @@
  #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
  
-@@ -203,7 +210,7 @@
+@@ -203,13 +210,13 @@
  failed(const char *msg)
  {
@@ -41356 +59758 @@
  
      if ((int) len < (int) sizeof(temp) - 12) {
-        strcpy(temp, _nc_progname);
+-       strcpy(temp, _nc_progname);
+-       strcat(temp, ": ");
++       _nc_STRCPY(temp, _nc_progname, sizeof(temp));
++       _nc_STRCAT(temp, ": ", sizeof(temp));
+     } else {
+-       strcpy(temp, "tset: ");
++       _nc_STRCPY(temp, "tset: ", sizeof(temp));
+     }
+     perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2));
+     exit_error();
 @@ -1043,11 +1050,18 @@
  {
@@ -41390 +59801 @@
             /* Set window size if not set already */
 diff -Naur ncurses-5.9.orig/test/Makefile.in ncurses-5.9/test/Makefile.in
---- ncurses-5.9.orig/test/Makefile.in   2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/Makefile.in        2012-02-16 18:25:13.011819328 +0000
+--- ncurses-5.9.orig/test/Makefile.in   2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/Makefile.in        2012-08-25 19:58:00.063231144 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.108 2010/11/28 16:39:40 tom Exp $
@@ -41422 +59833 @@
  LINT_OPTS      = @LINT_OPTS@
 diff -Naur ncurses-5.9.orig/test/README ncurses-5.9/test/README
---- ncurses-5.9.orig/test/README        2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/README     2012-02-16 18:25:13.215824712 +0000
+--- ncurses-5.9.orig/test/README        2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/README     2012-08-25 19:58:00.399896218 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -41459 +59870 @@
  use_env_sp                     -
 diff -Naur ncurses-5.9.orig/test/aclocal.m4 ncurses-5.9/test/aclocal.m4
---- ncurses-5.9.orig/test/aclocal.m4    2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/aclocal.m4 2012-02-16 18:25:13.139822706 +0000
+--- ncurses-5.9.orig/test/aclocal.m4    2012-08-25 19:57:59.406567583 +0000
++++ ncurses-5.9/test/aclocal.m4 2012-08-25 19:58:02.206554341 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -41473 +59884 @@
  dnl
 -dnl $Id: aclocal.m4,v 1.50 2011/03/24 08:28:07 tom Exp $
-+dnl $Id: aclocal.m4,v 1.74 2012/01/14 17:16:53 tom Exp $
++dnl $Id: aclocal.m4,v 1.78 2012/08/04 18:14:48 tom Exp $
  dnl
  dnl Author: Thomas E. Dickey
@@ -41546 +59957 @@
  cf_cv_ansi_cc=no
  cf_save_CFLAGS="$CFLAGS"
-@@ -533,7 +579,7 @@
+@@ -434,6 +480,39 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
++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 not ignore some gcc options.
++dnl
++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
++dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
++dnl the wrappers for gcc and g++ warnings.
++dnl
++dnl $1 = GCC (default) or GXX
++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
++dnl $3 = CFLAGS (default) or CXXFLAGS
++AC_DEFUN([CF_CLANG_COMPILER],[
++ifelse([$2],,CLANG_COMPILER,[$2])=no
++
++if test "$ifelse([$1],,[$1],GCC)" = yes ; then
++       AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
++       cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
++       ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
++       AC_TRY_COMPILE([],[
++#ifdef __clang__
++#else
++make an error
++#endif
++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++],[])
++       ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
++       AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
++fi
++])
++dnl ---------------------------------------------------------------------------
+ dnl CF_CURSES_ACS_MAP version: 6 updated: 2010/10/23 15:54:49
+ dnl -----------------
+ dnl Check for likely values of acs_map[]:
+@@ -533,7 +612,7 @@
  CF_CURSES_LIBS
  ])dnl
@@ -41555 +60006 @@
  dnl Look for the curses headers.
  AC_DEFUN([CF_CURSES_CPPFLAGS],[
-@@ -542,13 +588,19 @@
+@@ -542,13 +621,19 @@
  cf_cv_curses_incdir=no
  case $host_os in #(vi
@@ -41580 +60031 @@
  esac
  ])
-@@ -558,7 +610,7 @@
+@@ -558,7 +643,7 @@
  CF_TERM_HEADER
  ])dnl
@@ -41589 +60040 @@
  dnl Curses-functions are a little complicated, since a lot of them are macros.
  AC_DEFUN([CF_CURSES_FUNCS],
-@@ -566,6 +618,7 @@
+@@ -566,6 +651,7 @@
  AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
  AC_REQUIRE([CF_XOPEN_CURSES])
@@ -41597 +60048 @@
  do
         CF_UPPER(cf_tr_func,$cf_func)
-@@ -578,7 +631,8 @@
+@@ -578,7 +664,8 @@
                         [
  #ifndef ${cf_func}
@@ -41607 +60058 @@
                         ],
                         [cf_result=yes],
-@@ -595,7 +649,7 @@
+@@ -595,7 +682,7 @@
  done
  ])dnl
@@ -41616 +60067 @@
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
-@@ -605,10 +659,10 @@
+@@ -605,10 +692,10 @@
  AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
  cf_cv_ncurses_header=none
@@ -41631 +60082 @@
  AC_TRY_COMPILE([#include <${cf_header}>],
         [initscr(); tgoto("?", 0,0)],
-@@ -624,7 +678,7 @@
+@@ -624,7 +711,7 @@
  AC_CHECK_HEADERS($cf_cv_ncurses_header)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_CURSES_LIBS version: 33 updated: 2011/03/06 12:37:18
-+dnl CF_CURSES_LIBS version: 35 updated: 2011/08/09 21:06:37
++dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48
  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.
-@@ -644,16 +698,23 @@
+@@ -644,16 +731,23 @@
      AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
      ;;
@@ -41674 +60125 @@
  linux*)
         case `arch 2>/dev/null` in
-@@ -671,9 +732,12 @@
+@@ -671,9 +765,12 @@
         esac
      ;;
@@ -41690 +60141 @@
      ac_cv_func_initscr=yes
      ;;
-@@ -694,7 +758,7 @@
+@@ -694,7 +791,7 @@
      # Check for library containing tgoto.  Do this before curses library
      # because it may be needed to link the test-case for initscr.
      AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
 -        for cf_term_lib in $cf_check_list termcap termlib unknown
-+        for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
++        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
          do
              AC_CHECK_LIB($cf_term_lib,tgoto,[break])
          done
-@@ -738,7 +802,7 @@
+@@ -738,7 +835,7 @@
  
  ])dnl
@@ -41708 +60159 @@
  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,
-@@ -752,9 +816,17 @@
+@@ -752,9 +849,17 @@
  
  # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
@@ -41729 +60180 @@
         AC_TRY_COMPILE([
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -800,6 +872,61 @@
+@@ -800,6 +905,61 @@
  esac
  ])dnl
@@ -41791 +60242 @@
  dnl ------------------
  dnl Check for likely values of wacs_map[].
-@@ -922,6 +1049,25 @@
+@@ -922,6 +1082,25 @@
  fi
  ])dnl
@@ -41817 +60268 @@
  dnl ------------------
  dnl Configure-option to enable gcc warnings
-@@ -1377,6 +1523,29 @@
+@@ -1268,7 +1447,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+ 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:
+@@ -1291,6 +1470,7 @@
+ [
+ AC_REQUIRE([CF_GCC_VERSION])
+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ 
+ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "${as_me:-configure}"
+@@ -1366,6 +1546,13 @@
+                                        continue;;
+                                esac
+                                ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [[12]].*)
++                                       CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
++                                       continue;;
++                               esac
++                               ;;
+                        esac
+                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+                fi
+@@ -1377,6 +1564,29 @@
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
@@ -41847 +60329 @@
  dnl -------------
  dnl Check if we must define _GNU_SOURCE to get a reasonable value for
-@@ -1498,6 +1667,60 @@
+@@ -1498,6 +1708,60 @@
  fi
  ])dnl
@@ -41908 +60390 @@
  dnl ---------------
  dnl Construct a search-list of directories for a nonstandard library-file
-@@ -1690,7 +1913,7 @@
+@@ -1690,7 +1954,7 @@
         ,[$1=no])
  ])dnl
@@ -41917 +60399 @@
  dnl Tie together the configure-script macros for ncurses.
  dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-@@ -1702,7 +1925,10 @@
+@@ -1702,7 +1966,10 @@
  cf_ncuconfig_root=ifelse($1,,ncurses,$1)
  
@@ -41929 +60411 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -2133,13 +2359,15 @@
+@@ -2096,7 +2363,7 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
+ 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
+@@ -2116,7 +2383,7 @@
+   ;;
+ .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
+   ;;
+-.\[$]{*prefix}*) #(vi
++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
+   eval $1="[$]$1"
+   case ".[$]$1" in #(vi
+   .NONE/*)
+@@ -2133,13 +2400,15 @@
  esac
  ])dnl
@@ -41947 +60447 @@
  if test "$XCURSES_CONFIG" != none ; then
  
-@@ -2176,7 +2404,7 @@
+@@ -2176,7 +2445,7 @@
  fi
  ])dnl
@@ -41956 +60456 @@
  dnl Check for the package-config program, unless disabled by command-line.
  AC_DEFUN([CF_PKG_CONFIG],
-@@ -2193,7 +2421,9 @@
+@@ -2193,7 +2462,9 @@
         PKG_CONFIG=none
         ;;
@@ -41967 +60467 @@
  *)
         PKG_CONFIG=$withval
-@@ -2373,6 +2603,121 @@
+@@ -2373,6 +2644,121 @@
                 -e 's/-[[UD]]'"$3"'\(=[[^       ]]*\)\?[$]//g'`
  ])dnl
@@ -42089 +60589 @@
  dnl ---------------
  dnl signal handler, but there are some gcc depedencies in that recommendation.
-@@ -2495,6 +2840,59 @@
+@@ -2495,6 +2881,59 @@
  esac
  ])dnl
@@ -42149 +60649 @@
  dnl -----------------
  dnl This is a simple wrapper to use for pkg-config, for libraries which may be
-@@ -2520,6 +2918,45 @@
+@@ -2520,6 +2959,45 @@
  fi
  ])
@@ -42195 +60695 @@
  dnl --------
  dnl Make an uppercase version of a variable
-@@ -2667,6 +3104,60 @@
+@@ -2667,6 +3145,60 @@
  fi
  ])dnl
@@ -42256 +60756 @@
  dnl ----------------
  AC_DEFUN([CF_WITH_VALGRIND],[
-@@ -2714,7 +3205,7 @@
+@@ -2714,7 +3246,7 @@
  test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
  ])dnl
@@ -42265 +60765 @@
  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,
-@@ -2730,7 +3221,7 @@
+@@ -2730,7 +3262,7 @@
  cf_xopen_source=
  
@@ -42274 +60774 @@
         ;;
  cygwin) #(vi
-@@ -2741,6 +3232,7 @@
+@@ -2741,6 +3273,7 @@
         ;;
  darwin*) #(vi
@@ -42282 +60782 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -2758,15 +3250,23 @@
+@@ -2758,15 +3291,23 @@
         ;;
  irix[[56]].*) #(vi
@@ -42308 +60808 @@
  openbsd*) #(vi
         # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -2780,36 +3280,11 @@
+@@ -2780,36 +3321,11 @@
  sco*) #(vi
         # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
@@ -42347 +60847 @@
         ;;
  esac
-@@ -2817,6 +3292,35 @@
+@@ -2817,6 +3333,35 @@
  if test -n "$cf_xopen_source" ; then
         CF_ADD_CFLAGS($cf_xopen_source)
@@ -42383 +60883 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
-@@ -2957,7 +3461,7 @@
+@@ -2957,7 +3502,7 @@
  fi
  ])
@@ -42392 +60892 @@
  dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
  dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
-@@ -2973,19 +3477,24 @@
+@@ -2973,19 +3518,24 @@
         /usr/local
  do
@@ -42424 +60924 @@
                         AC_TRY_LINK([
  #include <X11/Intrinsic.h>
-@@ -2996,12 +3505,14 @@
+@@ -2996,12 +3546,14 @@
                                 [cf_result=no])
                         AC_MSG_RESULT($cf_result)
@@ -42442 +60942 @@
  if test -z "$cf_x_athena_lib" ; then
 diff -Naur ncurses-5.9.orig/test/background.c ncurses-5.9/test/background.c
---- ncurses-5.9.orig/test/background.c  2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/background.c       2012-02-16 18:25:13.015819433 +0000
+--- ncurses-5.9.orig/test/background.c  2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/background.c       2012-08-25 19:58:01.743223199 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2003-2006,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2003-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -26,15 +26,128 @@
+@@ -26,15 +26,172 @@
   * authorization.                                                           *
   ****************************************************************************/
  /*
 - * $Id: background.c,v 1.3 2006/06/03 16:43:08 tom Exp $
-+ * $Id: background.c,v 1.9 2011/04/23 21:16:38 tom Exp $
++ * $Id: background.c,v 1.13 2012/06/09 20:30:33 tom Exp $
   */
  
@@ -42471 +60971 @@
 +{
 +    short f, b;
-+
-+    pair_content(0, &f, &b);
-+    printw("pair 0 contains (%d,%d)\n", f, b);
++    int row;
++    int chr;
++
++    if (pair_content(0, &f, &b) == ERR) {
++       printw("pair 0 contains no data\n");
++    } else {
++       printw("pair 0 contains (%d,%d)\n", f, b);
++    }
 +    getch();
 +
 +    printw("Initializing pair 1 to red/%s\n", color_name(default_bg));
 +    init_pair(1, COLOR_RED, (short) default_bg);
-+    bkgdset(' ' | COLOR_PAIR(1));
++    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
 +    printw("RED/BLACK\n");
 +    getch();
@@ -42484 +60989 @@
 +    printw("Initializing pair 2 to %s/blue\n", color_name(default_fg));
 +    init_pair(2, (short) default_fg, COLOR_BLUE);
-+    bkgdset(' ' | COLOR_PAIR(2));
++    bkgdset((chtype) (' ' | COLOR_PAIR(2)));
 +    printw("This line should be %s/blue\n", color_name(default_fg));
 +    getch();
 +
-+    printw("Resetting colors to pair 0\n");
-+    bkgdset(' ' | COLOR_PAIR(0));
++    printw("Initializing pair 3 to %s/cyan (ACS_HLINE)\n", color_name(default_fg));
++    init_pair(3, (short) default_fg, COLOR_CYAN);
++    printw("...and drawing a box which should be followed by lines\n");
++    bkgdset(ACS_HLINE | COLOR_PAIR(3));
++    /*
++     * Characters from vt100 line-drawing should be mapped to line-drawing,
++     * since A_ALTCHARSET is set in the background, and the character part
++     * of the background is replaced by the nonblank characters written.
++     *
++     * Characters not in the line-drawing range are usually sent as-is.
++     *
++     * With SVr4 curses it is possible to rely on this to mix uppercase text
++     * with the (lowercase) line-drawing characters.  ncurses uses some of
++     * the uppercase characters for encoding thick- and double-lines.
++     */
++    row = 7;
++    mvprintw(row++, 10, "l");
++    for (chr = 0; chr < 32; ++chr)
++       addch(' ');
++    printw("x\n");
++    chr = 32;
++    while (chr < 128) {
++       if ((chr % 32) == 0)
++           mvprintw(row++, 10, "x");
++       addch((chtype) ((chr == 127) ? ' ' : chr));
++       if ((++chr % 32) == 0)
++           printw("x\n");
++    }
++    mvprintw(row++, 10, "m");
++    for (chr = 0; chr < 32; ++chr)
++       addch(' ');
++    printw("j\n");
++    getch();
++
++    bkgdset((chtype) (' ' | COLOR_PAIR(0)));
 +    printw("Default Colors\n");
 +    getch();
 +
 +    printw("Resetting colors to pair 1\n");
-+    bkgdset(' ' | COLOR_PAIR(1));
++    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
 +    printw("This line should be red/%s\n", color_name(default_bg));
 +    getch();
 +
 +    printw("Setting screen to pair 0\n");
-+    bkgd(' ' | COLOR_PAIR(0));
++    bkgd((chtype) (' ' | COLOR_PAIR(0)));
 +    getch();
 +
 +    printw("Setting screen to pair 1\n");
-+    bkgd(' ' | COLOR_PAIR(1));
++    bkgd((chtype) (' ' | COLOR_PAIR(1)));
 +    getch();
 +
 +    printw("Setting screen to pair 2\n");
-+    bkgd(' ' | COLOR_PAIR(2));
++    bkgd((chtype) (' ' | COLOR_PAIR(2)));
 +    getch();
 +
++    printw("Setting screen to pair 3\n");
++    bkgd((chtype) (' ' | COLOR_PAIR(3)));
++    getch();
++
 +    printw("Setting screen to pair 0\n");
-+    bkgd(' ' | COLOR_PAIR(0));
++    bkgd((chtype) (' ' | COLOR_PAIR(0)));
 +    getch();
 +}
@@ -42551 +61093 @@
 +#endif
 +    int n;
++
++    setlocale(LC_ALL, "");
 +
 +    while ((n = getopt(argc, argv, "ab:df:")) != -1) {
@@ -42583 +61127 @@
      initscr();
      cbreak();
-@@ -43,47 +156,30 @@
+@@ -43,47 +200,30 @@
      if (has_colors()) {
         start_color();
@@ -42589 +61133 @@
 -       pair_content(0, &f, &b);
 -       printw("pair 0 contains (%d,%d)\n", f, b);
--       getch();
--
--       printw("Initializing pair 1 to red/black\n");
--       init_pair(1, COLOR_RED, COLOR_BLACK);
--       bkgdset(' ' | COLOR_PAIR(1));
--       printw("RED/BLACK\n");
--       getch();
--
--       printw("Initializing pair 2 to white/blue\n");
--       init_pair(2, COLOR_WHITE, COLOR_BLUE);
--       bkgdset(' ' | COLOR_PAIR(2));
--       printw("WHITE/BLUE\n");
--       getch();
--
--       printw("Resetting colors to pair 0\n");
--       bkgdset(' ' | COLOR_PAIR(0));
--       printw("Default Colors\n");
--       getch();
--
--       printw("Resetting colors to pair 1\n");
--       bkgdset(' ' | COLOR_PAIR(1));
--       printw("RED/BLACK\n");
 -       getch();
 +#if HAVE_USE_DEFAULT_COLORS
@@ -42635 +61157 @@
 +#endif
  
+-       printw("Initializing pair 1 to red/black\n");
+-       init_pair(1, COLOR_RED, COLOR_BLACK);
+-       bkgdset(' ' | COLOR_PAIR(1));
+-       printw("RED/BLACK\n");
+-       getch();
+-
+-       printw("Initializing pair 2 to white/blue\n");
+-       init_pair(2, COLOR_WHITE, COLOR_BLUE);
+-       bkgdset(' ' | COLOR_PAIR(2));
+-       printw("WHITE/BLUE\n");
+-       getch();
+-
+-       printw("Resetting colors to pair 0\n");
+-       bkgdset(' ' | COLOR_PAIR(0));
+-       printw("Default Colors\n");
+-       getch();
+-
+-       printw("Resetting colors to pair 1\n");
+-       bkgdset(' ' | COLOR_PAIR(1));
+-       printw("RED/BLACK\n");
+-       getch();
+-
 -       printw("Setting screen to pair 0\n");
 -       bkgd(' ' | COLOR_PAIR(0));
@@ -42654 +61198 @@
      } else {
         printw("This demo requires a color terminal");
+diff -Naur ncurses-5.9.orig/test/bs.c ncurses-5.9/test/bs.c
+--- ncurses-5.9.orig/test/bs.c  2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/bs.c       2012-08-25 19:58:01.743223199 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -34,7 +34,7 @@
+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+  * v2.1 with ncurses mouse support, September 1995
+  *
+- * $Id: bs.c,v 1.52 2010/11/13 20:07:52 tom Exp $
++ * $Id: bs.c,v 1.53 2012/06/09 20:30:32 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -368,7 +368,7 @@
+        MvAddCh(PYBASE + i, PXBASE - 3, (chtype) (i + 'A'));
+ #ifdef A_COLOR
+        if (has_colors())
+-           attron(COLOR_PAIR(COLOR_BLUE));
++           attron((attr_t) COLOR_PAIR(COLOR_BLUE));
+ #endif /* A_COLOR */
+        (void) addch(' ');
+        for (j = 0; j < BWIDTH; j++)
+@@ -386,7 +386,7 @@
+        MvAddCh(CYBASE + i, CXBASE - 3, (chtype) (i + 'A'));
+ #ifdef A_COLOR
+        if (has_colors())
+-           attron(COLOR_PAIR(COLOR_BLUE));
++           attron((attr_t) COLOR_PAIR(COLOR_BLUE));
+ #endif /* A_COLOR */
+        (void) addch(' ');
+        for (j = 0; j < BWIDTH; j++)
+@@ -769,7 +769,7 @@
+                                    cgoto(y1, x1);
+ #ifdef A_COLOR
+                                    if (has_colors())
+-                                       attron(COLOR_PAIR(COLOR_GREEN));
++                                       attron((attr_t) COLOR_PAIR(COLOR_GREEN));
+ #endif /* A_COLOR */
+                                    (void) addch(MARK_MISS);
+ #ifdef A_COLOR
+@@ -795,7 +795,7 @@
+                        pgoto(y1, x1);
+ #ifdef A_COLOR
+                        if (has_colors())
+-                           attron(COLOR_PAIR(COLOR_RED));
++                           attron((attr_t) COLOR_PAIR(COLOR_RED));
+ #endif /* A_COLOR */
+                        (void) addch(SHOWHIT);
+ #ifdef A_COLOR
+@@ -834,9 +834,9 @@
+ #ifdef A_COLOR
+     if (has_colors()) {
+        if (hit)
+-           attron(COLOR_PAIR(COLOR_RED));
++           attron((attr_t) COLOR_PAIR(COLOR_RED));
+        else
+-           attron(COLOR_PAIR(COLOR_GREEN));
++           attron((attr_t) COLOR_PAIR(COLOR_GREEN));
+     }
+ #endif /* A_COLOR */
+     (void) addch((chtype) hits[PLAYER][curx][cury]);
+@@ -965,9 +965,9 @@
+ #ifdef A_COLOR
+     if (has_colors()) {
+        if (hit)
+-           attron(COLOR_PAIR(COLOR_RED));
++           attron((attr_t) COLOR_PAIR(COLOR_RED));
+        else
+-           attron(COLOR_PAIR(COLOR_GREEN));
++           attron((attr_t) COLOR_PAIR(COLOR_GREEN));
+     }
+ #endif /* A_COLOR */
+     (void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH));
+diff -Naur ncurses-5.9.orig/test/cardfile.c ncurses-5.9/test/cardfile.c
+--- ncurses-5.9.orig/test/cardfile.c    2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/cardfile.c 2012-08-25 19:58:01.746556517 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1999-2008,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1999-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: cardfile.c,v 1.38 2010/11/14 00:58:45 tom Exp $
++ * $Id: cardfile.c,v 1.39 2012/06/09 20:30:32 tom Exp $
+  *
+  * File format: text beginning in column 1 is a title; other text is content.
+  */
+@@ -414,7 +414,7 @@
+        if ((win = newwin(panel_high, panel_wide, y, x)) == 0)
+            break;
+ 
+-       wbkgd(win, COLOR_PAIR(pair_2));
++       wbkgd(win, (chtype) COLOR_PAIR(pair_2));
+        keypad(win, TRUE);
+        p->panel = new_panel(win);
+        box(win, 0, 0);
+@@ -588,7 +588,7 @@
+            start_color();
+            init_pair(pair_1, COLOR_WHITE, COLOR_BLUE);
+            init_pair(pair_2, COLOR_WHITE, COLOR_CYAN);
+-           bkgd(COLOR_PAIR(pair_1));
++           bkgd((chtype) COLOR_PAIR(pair_1));
+        } else {
+            try_color = FALSE;
+        }
+diff -Naur ncurses-5.9.orig/test/clip_printw.c ncurses-5.9/test/clip_printw.c
+--- ncurses-5.9.orig/test/clip_printw.c 2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/clip_printw.c      2012-08-25 19:58:01.746556517 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: clip_printw.c,v 1.7 2010/11/13 20:48:48 tom Exp $
++ * $Id: clip_printw.c,v 1.8 2012/06/09 20:30:32 tom Exp $
+  *
+  * demonstrate how to use printw without wrapping.
+  */
+@@ -329,7 +329,7 @@
+     do {
+        switch (st.ch) {
+        case '.':               /* change from current position */
+-           (void) wattrset(win, st.attr | (chtype) COLOR_PAIR(st.pair));
++           (void) wattrset(win, (int) (st.attr | (chtype) COLOR_PAIR(st.pair)));
+            if (st.count > 0) {
+                need = (unsigned) st.count + 1;
+                sprintf(fmt, "%%c%%%ds%%c", st.count);
 diff -Naur ncurses-5.9.orig/test/color_name.h ncurses-5.9/test/color_name.h
 --- ncurses-5.9.orig/test/color_name.h  1970-01-01 00:00:00.000000000 +0000
-+++ ncurses-5.9/test/color_name.h       2012-02-16 18:25:13.015819433 +0000
++++ ncurses-5.9/test/color_name.h       2012-08-25 19:58:00.066564462 +0000
 @@ -0,0 +1,103 @@
 +/****************************************************************************
@@ -42762 +61450 @@
 +#endif /* __COLORNAME_H */
 diff -Naur ncurses-5.9.orig/test/configure ncurses-5.9/test/configure
---- ncurses-5.9.orig/test/configure     2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/configure  2012-02-16 18:25:13.151823021 +0000
+--- ncurses-5.9.orig/test/configure     2012-08-25 19:57:59.406567583 +0000
++++ ncurses-5.9/test/configure  2012-08-25 19:58:02.406553397 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20101002.
++# Generated by Autoconf 2.52.20120811.
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
 @@ -105,42 +105,6 @@
  : ${ac_max_here_lines=38}
@@ -42807 +61503 @@
  # Initialize some variables set by options.
  ac_init_help=
-@@ -687,17 +651,20 @@
+@@ -170,15 +134,16 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++infodir='${datarootdir}/info'
++mandir='${datarootdir}/man'
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -229,6 +194,13 @@
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -504,7 +476,7 @@
+ done
+ 
+ # Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
+               localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+@@ -641,15 +613,16 @@
+   --bindir=DIR            user executables [EPREFIX/bin]
+   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR        program executables [EPREFIX/libexec]
+-  --datadir=DIR           read-only architecture-independent data [PREFIX/share]
++  --datarootdir=DIR       read-only architecture-independent data [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --infodir=DIR           info documentation [PREFIX/info]
+-  --mandir=DIR            man documentation [PREFIX/man]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
+ EOF
+ 
+   cat <<\EOF
+@@ -687,17 +660,20 @@
    --with-dbmalloc         test: use Conor Cahill's dbmalloc library
    --with-valgrind         test: use valgrind
@@ -42831 +61590 @@
  Some influential environment variables:
    CC          C compiler command
-@@ -891,7 +858,7 @@
+@@ -767,7 +743,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20101002.  Invocation command line was
++generated by GNU Autoconf 2.52.20120811.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -891,7 +867,7 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:894: loading site script $ac_site_file" >&5
-+    { echo "$as_me:861: loading site script $ac_site_file" >&5
++    { echo "$as_me:870: 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"
-@@ -902,7 +869,7 @@
+@@ -902,7 +878,7 @@
    # 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:905: loading cache $cache_file" >&5
-+    { echo "$as_me:872: loading cache $cache_file" >&5
++    { echo "$as_me:881: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -910,7 +877,7 @@
+@@ -910,7 +886,7 @@
      esac
    fi
  else
 -  { echo "$as_me:913: creating cache $cache_file" >&5
-+  { echo "$as_me:880: creating cache $cache_file" >&5
++  { echo "$as_me:889: creating cache $cache_file" >&5
  echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -926,21 +893,21 @@
+@@ -926,21 +902,21 @@
    eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:929: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:896: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:905: 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:933: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:900: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:909: 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=: ;;
@@ -42875 +61643 @@
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -        { echo "$as_me:939: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:906: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:915: 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:941:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:908:   former value:  $ac_old_val" >&5
++        { echo "$as_me:917:   former value:  $ac_old_val" >&5
  echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:943:   current value: $ac_new_val" >&5
-+        { echo "$as_me:910:   current value: $ac_new_val" >&5
++        { echo "$as_me:919:   current value: $ac_new_val" >&5
  echo "$as_me:   current value: $ac_new_val" >&2;}
          ac_cache_corrupted=:
        fi;;
-@@ -959,9 +926,9 @@
+@@ -959,9 +935,9 @@
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:962: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:929: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:938: 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:964: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:931: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:940: 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
-@@ -982,10 +949,10 @@
+@@ -982,10 +958,10 @@
  echo "#! $SHELL" >conftest.sh
  echo  "exit 0"   >>conftest.sh
  chmod +x conftest.sh
 -if { (echo "$as_me:985: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:952: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:961: PATH=\".;.\"; conftest.sh") >&5
    (PATH=".;."; conftest.sh) 2>&5
    ac_status=$?
 -  echo "$as_me:988: \$? = $ac_status" >&5
-+  echo "$as_me:955: \$? = $ac_status" >&5
++  echo "$as_me:964: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    ac_path_separator=';'
  else
-@@ -1017,7 +984,7 @@
+@@ -1017,7 +993,7 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:1020: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:987: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:996: 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
-@@ -1027,11 +994,11 @@
+@@ -1027,11 +1003,11 @@
  
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:1030: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:997: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1006: error: cannot run $ac_config_sub" >&5
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:1034: checking build system type" >&5
-+echo "$as_me:1001: checking build system type" >&5
++echo "$as_me:1010: 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
-@@ -1040,16 +1007,16 @@
+@@ -1040,16 +1016,16 @@
  test -z "$ac_cv_build_alias" &&
    ac_cv_build_alias=`$ac_config_guess`
  test -z "$ac_cv_build_alias" &&
 -  { { echo "$as_me:1043: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1010: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1019: error: cannot guess build type; you must specify one" >&5
  echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
  ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 -  { { echo "$as_me:1047: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1014: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1023: 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; }; }
@@ -42949 +61717 @@
  fi
 -echo "$as_me:1052: result: $ac_cv_build" >&5
-+echo "$as_me:1019: result: $ac_cv_build" >&5
++echo "$as_me:1028: result: $ac_cv_build" >&5
  echo "${ECHO_T}$ac_cv_build" >&6
  build=$ac_cv_build
  build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1057,7 +1024,7 @@
+@@ -1057,7 +1033,7 @@
  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:1060: checking host system type" >&5
-+       echo "$as_me:1027: checking host system type" >&5
++       echo "$as_me:1036: 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
-@@ -1066,12 +1033,12 @@
+@@ -1066,12 +1042,12 @@
  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:1069: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1036: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1045: 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; }; }
@@ -42973 +61741 @@
  fi
 -echo "$as_me:1074: result: $ac_cv_host" >&5
-+echo "$as_me:1041: result: $ac_cv_host" >&5
++echo "$as_me:1050: result: $ac_cv_host" >&5
  echo "${ECHO_T}$ac_cv_host" >&6
  host=$ac_cv_host
  host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1096,13 +1063,13 @@
+@@ -1096,13 +1072,13 @@
  fi
  
  test -z "$system_name" && system_name="$cf_cv_system_name"
 -test -n "$cf_cv_system_name" && echo "$as_me:1099: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1066: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1075: 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 "$as_me:1103: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+       echo "$as_me:1070: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++       echo "$as_me:1079: 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 "$as_me:1105: error: \"Please remove config.cache and try again.\"" >&5
-+       { { echo "$as_me:1072: error: \"Please remove config.cache and try again.\"" >&5
++       { { echo "$as_me:1081: 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
-@@ -1120,7 +1087,7 @@
+@@ -1120,7 +1096,7 @@
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
  rm conftest.sed
  
 -echo "$as_me:1123: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:1090: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1099: 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
-@@ -1140,11 +1107,11 @@
+@@ -1140,11 +1116,11 @@
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:1143: result: yes" >&5
-+  echo "$as_me:1110: result: yes" >&5
++  echo "$as_me:1119: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    SET_MAKE=
  else
 -  echo "$as_me:1147: result: no" >&5
-+  echo "$as_me:1114: result: no" >&5
++  echo "$as_me:1123: result: no" >&5
  echo "${ECHO_T}no" >&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -1158,7 +1125,7 @@
+@@ -1158,7 +1134,7 @@
  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:1161: checking for $ac_word" >&5
-+echo "$as_me:1128: checking for $ac_word" >&5
++echo "$as_me:1137: 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
-@@ -1173,7 +1140,7 @@
+@@ -1173,7 +1149,7 @@
    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:1176: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1143: found $ac_dir/$ac_word" >&5
++echo "$as_me:1152: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1181,10 +1148,10 @@
+@@ -1181,10 +1157,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1184: result: $CC" >&5
-+  echo "$as_me:1151: result: $CC" >&5
++  echo "$as_me:1160: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1187: result: no" >&5
-+  echo "$as_me:1154: result: no" >&5
++  echo "$as_me:1163: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1193,7 +1160,7 @@
+@@ -1193,7 +1169,7 @@
    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:1196: checking for $ac_word" >&5
-+echo "$as_me:1163: checking for $ac_word" >&5
++echo "$as_me:1172: 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
-@@ -1208,7 +1175,7 @@
+@@ -1208,7 +1184,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_CC="gcc"
 -echo "$as_me:1211: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1178: found $ac_dir/$ac_word" >&5
++echo "$as_me:1187: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1216,10 +1183,10 @@
+@@ -1216,10 +1192,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1219: result: $ac_ct_CC" >&5
-+  echo "$as_me:1186: result: $ac_ct_CC" >&5
++  echo "$as_me:1195: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1222: result: no" >&5
-+  echo "$as_me:1189: result: no" >&5
++  echo "$as_me:1198: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1232,7 +1199,7 @@
+@@ -1232,7 +1208,7 @@
    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:1235: checking for $ac_word" >&5
-+echo "$as_me:1202: checking for $ac_word" >&5
++echo "$as_me:1211: 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
-@@ -1247,7 +1214,7 @@
+@@ -1247,7 +1223,7 @@
    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:1250: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1217: found $ac_dir/$ac_word" >&5
++echo "$as_me:1226: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1255,10 +1222,10 @@
+@@ -1255,10 +1231,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1258: result: $CC" >&5
-+  echo "$as_me:1225: result: $CC" >&5
++  echo "$as_me:1234: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1261: result: no" >&5
-+  echo "$as_me:1228: result: no" >&5
++  echo "$as_me:1237: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1267,7 +1234,7 @@
+@@ -1267,7 +1243,7 @@
    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:1270: checking for $ac_word" >&5
-+echo "$as_me:1237: checking for $ac_word" >&5
++echo "$as_me:1246: 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
-@@ -1282,7 +1249,7 @@
+@@ -1282,7 +1258,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_CC="cc"
 -echo "$as_me:1285: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1252: found $ac_dir/$ac_word" >&5
++echo "$as_me:1261: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1290,10 +1257,10 @@
+@@ -1290,10 +1266,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1293: result: $ac_ct_CC" >&5
-+  echo "$as_me:1260: result: $ac_ct_CC" >&5
++  echo "$as_me:1269: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1296: result: no" >&5
-+  echo "$as_me:1263: result: no" >&5
++  echo "$as_me:1272: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1306,7 +1273,7 @@
+@@ -1306,7 +1282,7 @@
  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:1309: checking for $ac_word" >&5
-+echo "$as_me:1276: checking for $ac_word" >&5
++echo "$as_me:1285: 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
-@@ -1326,7 +1293,7 @@
+@@ -1326,7 +1302,7 @@
    continue
  fi
  ac_cv_prog_CC="cc"
 -echo "$as_me:1329: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1296: found $ac_dir/$ac_word" >&5
++echo "$as_me:1305: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1348,10 +1315,10 @@
+@@ -1348,10 +1324,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1351: result: $CC" >&5
-+  echo "$as_me:1318: result: $CC" >&5
++  echo "$as_me:1327: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1354: result: no" >&5
-+  echo "$as_me:1321: result: no" >&5
++  echo "$as_me:1330: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1362,7 +1329,7 @@
+@@ -1362,7 +1338,7 @@
    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:1365: checking for $ac_word" >&5
-+echo "$as_me:1332: checking for $ac_word" >&5
++echo "$as_me:1341: 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
-@@ -1377,7 +1344,7 @@
+@@ -1377,7 +1353,7 @@
    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:1380: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1347: found $ac_dir/$ac_word" >&5
++echo "$as_me:1356: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1385,10 +1352,10 @@
+@@ -1385,10 +1361,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1388: result: $CC" >&5
-+  echo "$as_me:1355: result: $CC" >&5
++  echo "$as_me:1364: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1391: result: no" >&5
-+  echo "$as_me:1358: result: no" >&5
++  echo "$as_me:1367: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1401,7 +1368,7 @@
+@@ -1401,7 +1377,7 @@
  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:1404: checking for $ac_word" >&5
-+echo "$as_me:1371: checking for $ac_word" >&5
++echo "$as_me:1380: 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
-@@ -1416,7 +1383,7 @@
+@@ -1416,7 +1392,7 @@
    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:1419: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1386: found $ac_dir/$ac_word" >&5
++echo "$as_me:1395: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1424,10 +1391,10 @@
+@@ -1424,10 +1400,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1427: result: $ac_ct_CC" >&5
-+  echo "$as_me:1394: result: $ac_ct_CC" >&5
++  echo "$as_me:1403: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1430: result: no" >&5
-+  echo "$as_me:1397: result: no" >&5
++  echo "$as_me:1406: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1439,32 +1406,32 @@
+@@ -1439,32 +1415,32 @@
  
  fi
  
 -test -z "$CC" && { { echo "$as_me:1442: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1409: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1418: error: no acceptable cc found in \$PATH" >&5
  echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
@@ -43245 +62013 @@
  # Provide some information about the compiler.
 -echo "$as_me:1447:" \
-+echo "$as_me:1414:" \
++echo "$as_me:1423:" \
       "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:1450: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1417: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1426: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1453: \$? = $ac_status" >&5
-+  echo "$as_me:1420: \$? = $ac_status" >&5
++  echo "$as_me:1429: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1455: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1422: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1431: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1458: \$? = $ac_status" >&5
-+  echo "$as_me:1425: \$? = $ac_status" >&5
++  echo "$as_me:1434: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1460: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1427: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1436: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1463: \$? = $ac_status" >&5
-+  echo "$as_me:1430: \$? = $ac_status" >&5
++  echo "$as_me:1439: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 1467 "configure"
-+#line 1434 "configure"
++#line 1443 "configure"
  #include "confdefs.h"
  
  int
-@@ -1480,13 +1447,13 @@
+@@ -1480,13 +1456,13 @@
  # 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:1483: checking for C compiler default output" >&5
-+echo "$as_me:1450: checking for C compiler default output" >&5
++echo "$as_me:1459: checking for C compiler default output" >&5
  echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 -if { (eval echo "$as_me:1486: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1453: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1462: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
 -  echo "$as_me:1489: \$? = $ac_status" >&5
-+  echo "$as_me:1456: \$? = $ac_status" >&5
++  echo "$as_me:1465: \$? = $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
-@@ -1509,34 +1476,34 @@
+@@ -1509,34 +1485,34 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1512: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1479: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1488: error: C compiler cannot create executables" >&5
  echo "$as_me: error: C compiler cannot create executables" >&2;}
     { (exit 77); exit 77; }; }
@@ -43305 +62073 @@
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:1518: result: $ac_file" >&5
-+echo "$as_me:1485: result: $ac_file" >&5
++echo "$as_me:1494: result: $ac_file" >&5
  echo "${ECHO_T}$ac_file" >&6
  
@@ -43311 +62079 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1523: checking whether the C compiler works" >&5
-+echo "$as_me:1490: checking whether the C compiler works" >&5
++echo "$as_me:1499: 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
@@ -43318 +62086 @@
    if { ac_try='./$ac_file'
 -  { (eval echo "$as_me:1529: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1505: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1532: \$? = $ac_status" >&5
-+  echo "$as_me:1499: \$? = $ac_status" >&5
++  echo "$as_me:1508: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
@@ -43330 +62098 @@
      else
 -       { { echo "$as_me:1539: error: cannot run C compiled programs.
-+       { { echo "$as_me:1506: error: cannot run C compiled programs.
++       { { echo "$as_me:1515: 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;}
-@@ -1544,24 +1511,24 @@
+@@ -1544,24 +1520,24 @@
      fi
    fi
  fi
 -echo "$as_me:1547: result: yes" >&5
-+echo "$as_me:1514: result: yes" >&5
++echo "$as_me:1523: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
@@ -43347 +62115 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1554: checking whether we are cross compiling" >&5
-+echo "$as_me:1521: checking whether we are cross compiling" >&5
++echo "$as_me:1530: checking whether we are cross compiling" >&5
  echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:1556: result: $cross_compiling" >&5
-+echo "$as_me:1523: result: $cross_compiling" >&5
++echo "$as_me:1532: result: $cross_compiling" >&5
  echo "${ECHO_T}$cross_compiling" >&6
  
 -echo "$as_me:1559: checking for executable suffix" >&5
-+echo "$as_me:1526: checking for executable suffix" >&5
++echo "$as_me:1535: checking for executable suffix" >&5
  echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 -if { (eval echo "$as_me:1561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1537: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:1564: \$? = $ac_status" >&5
-+  echo "$as_me:1531: \$? = $ac_status" >&5
++  echo "$as_me:1540: \$? = $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
-@@ -1577,25 +1544,25 @@
+@@ -1577,25 +1553,25 @@
    esac
  done
  else
 -  { { echo "$as_me:1580: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1547: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1556: 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; }; }
@@ -43377 +62145 @@
  rm -f conftest$ac_cv_exeext
 -echo "$as_me:1586: result: $ac_cv_exeext" >&5
-+echo "$as_me:1553: result: $ac_cv_exeext" >&5
++echo "$as_me:1562: result: $ac_cv_exeext" >&5
  echo "${ECHO_T}$ac_cv_exeext" >&6
  
@@ -43384 +62152 @@
  ac_exeext=$EXEEXT
 -echo "$as_me:1592: checking for object suffix" >&5
-+echo "$as_me:1559: checking for object suffix" >&5
++echo "$as_me:1568: checking for object suffix" >&5
  echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
  if test "${ac_cv_objext+set}" = set; then
@@ -43391 +62159 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1598 "configure"
-+#line 1565 "configure"
++#line 1574 "configure"
  #include "confdefs.h"
  
  int
-@@ -1607,10 +1574,10 @@
+@@ -1607,10 +1583,10 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:1610: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1577: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1586: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1613: \$? = $ac_status" >&5
-+  echo "$as_me:1580: \$? = $ac_status" >&5
++  echo "$as_me:1589: \$? = $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
-@@ -1622,24 +1589,24 @@
+@@ -1622,24 +1598,24 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1625: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1592: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1601: error: cannot compute OBJEXT: cannot compile" >&5
  echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
     { (exit 1); exit 1; }; }
@@ -43421 +62189 @@
  fi
 -echo "$as_me:1632: result: $ac_cv_objext" >&5
-+echo "$as_me:1599: result: $ac_cv_objext" >&5
++echo "$as_me:1608: result: $ac_cv_objext" >&5
  echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:1636: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1603: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1612: 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
@@ -43433 +62201 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1642 "configure"
-+#line 1609 "configure"
++#line 1618 "configure"
  #include "confdefs.h"
  
  int
-@@ -1654,16 +1621,16 @@
+@@ -1654,16 +1630,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1657: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1624: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1633: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1660: \$? = $ac_status" >&5
-+  echo "$as_me:1627: \$? = $ac_status" >&5
++  echo "$as_me:1636: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1663: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1639: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1666: \$? = $ac_status" >&5
-+  echo "$as_me:1633: \$? = $ac_status" >&5
++  echo "$as_me:1642: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -1675,19 +1642,19 @@
+@@ -1675,19 +1651,19 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:1678: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1645: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1654: result: $ac_cv_c_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -43470 +62238 @@
  CFLAGS="-g"
 -echo "$as_me:1684: checking whether $CC accepts -g" >&5
-+echo "$as_me:1651: checking whether $CC accepts -g" >&5
++echo "$as_me:1660: 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
@@ -43477 +62245 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1690 "configure"
-+#line 1657 "configure"
++#line 1666 "configure"
  #include "confdefs.h"
  
  int
-@@ -1699,16 +1666,16 @@
+@@ -1699,16 +1675,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1702: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1678: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1705: \$? = $ac_status" >&5
-+  echo "$as_me:1672: \$? = $ac_status" >&5
++  echo "$as_me:1681: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1708: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1675: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1684: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1711: \$? = $ac_status" >&5
-+  echo "$as_me:1678: \$? = $ac_status" >&5
++  echo "$as_me:1687: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
-@@ -1718,7 +1685,7 @@
+@@ -1718,7 +1694,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:1721: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1688: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1697: 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
-@@ -1745,16 +1712,16 @@
+@@ -1745,16 +1721,16 @@
  #endif
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1748: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1724: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1751: \$? = $ac_status" >&5
-+  echo "$as_me:1718: \$? = $ac_status" >&5
++  echo "$as_me:1727: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1754: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1721: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1730: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1757: \$? = $ac_status" >&5
-+  echo "$as_me:1724: \$? = $ac_status" >&5
++  echo "$as_me:1733: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
     ''\
-@@ -1766,7 +1733,7 @@
+@@ -1766,7 +1742,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1769 "configure"
-+#line 1736 "configure"
++#line 1745 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -1779,16 +1746,16 @@
+@@ -1779,16 +1755,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1782: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1749: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1785: \$? = $ac_status" >&5
-+  echo "$as_me:1752: \$? = $ac_status" >&5
++  echo "$as_me:1761: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1788: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1764: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1791: \$? = $ac_status" >&5
-+  echo "$as_me:1758: \$? = $ac_status" >&5
++  echo "$as_me:1767: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -1798,7 +1765,7 @@
+@@ -1798,7 +1774,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1801 "configure"
-+#line 1768 "configure"
++#line 1777 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -1810,16 +1777,16 @@
+@@ -1810,16 +1786,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1813: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1789: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1816: \$? = $ac_status" >&5
-+  echo "$as_me:1783: \$? = $ac_status" >&5
++  echo "$as_me:1792: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1819: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1795: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1822: \$? = $ac_status" >&5
-+  echo "$as_me:1789: \$? = $ac_status" >&5
++  echo "$as_me:1798: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -1853,7 +1820,7 @@
+@@ -1853,7 +1829,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
 -echo "$as_me:1856: checking how to run the C preprocessor" >&5
-+echo "$as_me:1823: checking how to run the C preprocessor" >&5
++echo "$as_me:1832: 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
-@@ -1874,18 +1841,18 @@
+@@ -1874,18 +1850,18 @@
    # 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 1877 "configure"
-+#line 1844 "configure"
++#line 1853 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -43612 +62380 @@
  _ACEOF
 -if { (eval echo "$as_me:1882: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1849: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1858: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -43619 +62387 @@
    cat conftest.err >&5
 -  echo "$as_me:1888: \$? = $ac_status" >&5
-+  echo "$as_me:1855: \$? = $ac_status" >&5
++  echo "$as_me:1864: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1908,17 +1875,17 @@
+@@ -1908,17 +1884,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1911 "configure"
-+#line 1878 "configure"
++#line 1887 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:1915: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1882: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1891: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -43640 +62408 @@
    cat conftest.err >&5
 -  echo "$as_me:1921: \$? = $ac_status" >&5
-+  echo "$as_me:1888: \$? = $ac_status" >&5
++  echo "$as_me:1897: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1955,7 +1922,7 @@
+@@ -1955,7 +1931,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:1958: result: $CPP" >&5
-+echo "$as_me:1925: result: $CPP" >&5
++echo "$as_me:1934: result: $CPP" >&5
  echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -1965,18 +1932,18 @@
+@@ -1965,18 +1941,18 @@
    # 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 1968 "configure"
-+#line 1935 "configure"
++#line 1944 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -43664 +62432 @@
  _ACEOF
 -if { (eval echo "$as_me:1973: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1940: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1949: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -43671 +62439 @@
    cat conftest.err >&5
 -  echo "$as_me:1979: \$? = $ac_status" >&5
-+  echo "$as_me:1946: \$? = $ac_status" >&5
++  echo "$as_me:1955: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1999,17 +1966,17 @@
+@@ -1999,17 +1975,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2002 "configure"
-+#line 1969 "configure"
++#line 1978 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2006: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1973: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1982: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -43692 +62460 @@
    cat conftest.err >&5
 -  echo "$as_me:2012: \$? = $ac_status" >&5
-+  echo "$as_me:1979: \$? = $ac_status" >&5
++  echo "$as_me:1988: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2037,7 +2004,7 @@
+@@ -2037,7 +2013,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:2040: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2007: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2016: error: C preprocessor \"$CPP\" fails sanity check" >&5
  echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -2053,7 +2020,7 @@
+@@ -2053,7 +2029,7 @@
  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:2056: checking for $ac_word" >&5
-+echo "$as_me:2023: checking for $ac_word" >&5
++echo "$as_me:2032: 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
-@@ -2068,7 +2035,7 @@
+@@ -2068,7 +2044,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AWK="$ac_prog"
 -echo "$as_me:2071: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2038: found $ac_dir/$ac_word" >&5
++echo "$as_me:2047: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2076,10 +2043,10 @@
+@@ -2076,10 +2052,10 @@
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
 -  echo "$as_me:2079: result: $AWK" >&5
-+  echo "$as_me:2046: result: $AWK" >&5
++  echo "$as_me:2055: result: $AWK" >&5
  echo "${ECHO_T}$AWK" >&6
  else
 -  echo "$as_me:2082: result: no" >&5
-+  echo "$as_me:2049: result: no" >&5
++  echo "$as_me:2058: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2098,7 +2065,7 @@
+@@ -2098,7 +2074,7 @@
  # 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:2101: checking for a BSD compatible install" >&5
-+echo "$as_me:2068: checking for a BSD compatible install" >&5
++echo "$as_me:2077: 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
-@@ -2147,7 +2114,7 @@
+@@ -2147,7 +2123,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
 -echo "$as_me:2150: result: $INSTALL" >&5
-+echo "$as_me:2117: result: $INSTALL" >&5
++echo "$as_me:2126: result: $INSTALL" >&5
  echo "${ECHO_T}$INSTALL" >&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2172,7 +2139,7 @@
+@@ -2172,7 +2148,7 @@
  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:2175: checking for $ac_word" >&5
-+echo "$as_me:2142: checking for $ac_word" >&5
++echo "$as_me:2151: 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
-@@ -2187,7 +2154,7 @@
+@@ -2187,7 +2163,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_LINT="$ac_prog"
 -echo "$as_me:2190: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2157: found $ac_dir/$ac_word" >&5
++echo "$as_me:2166: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2195,17 +2162,17 @@
+@@ -2195,17 +2171,17 @@
  fi
  LINT=$ac_cv_prog_LINT
  if test -n "$LINT"; then
 -  echo "$as_me:2198: result: $LINT" >&5
-+  echo "$as_me:2165: result: $LINT" >&5
++  echo "$as_me:2174: result: $LINT" >&5
  echo "${ECHO_T}$LINT" >&6
  else
 -  echo "$as_me:2201: result: no" >&5
-+  echo "$as_me:2168: result: no" >&5
++  echo "$as_me:2177: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -43789 +62557 @@
  
 -echo "$as_me:2208: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:2175: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:2184: 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
-@@ -2232,7 +2199,7 @@
+@@ -2232,7 +2208,7 @@
  fi
  
  fi
 -echo "$as_me:2235: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:2202: result: $cf_cv_mixedcase" >&5
++echo "$as_me:2211: result: $cf_cv_mixedcase" >&5
  echo "${ECHO_T}$cf_cv_mixedcase" >&6
  test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
  #define MIXEDCASE_FILENAMES 1
-@@ -2242,7 +2209,7 @@
+@@ -2242,7 +2218,7 @@
  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:2245: checking for $ac_word" >&5
-+echo "$as_me:2212: checking for $ac_word" >&5
++echo "$as_me:2221: 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
-@@ -2257,7 +2224,7 @@
+@@ -2257,7 +2233,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CTAGS="$ac_prog"
 -echo "$as_me:2260: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2227: found $ac_dir/$ac_word" >&5
++echo "$as_me:2236: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2265,10 +2232,10 @@
+@@ -2265,10 +2241,10 @@
  fi
  CTAGS=$ac_cv_prog_CTAGS
  if test -n "$CTAGS"; then
 -  echo "$as_me:2268: result: $CTAGS" >&5
-+  echo "$as_me:2235: result: $CTAGS" >&5
++  echo "$as_me:2244: result: $CTAGS" >&5
  echo "${ECHO_T}$CTAGS" >&6
  else
 -  echo "$as_me:2271: result: no" >&5
-+  echo "$as_me:2238: result: no" >&5
++  echo "$as_me:2247: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2279,7 +2246,7 @@
+@@ -2279,7 +2255,7 @@
  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:2282: checking for $ac_word" >&5
-+echo "$as_me:2249: checking for $ac_word" >&5
++echo "$as_me:2258: 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
-@@ -2294,7 +2261,7 @@
+@@ -2294,7 +2270,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ETAGS="$ac_prog"
 -echo "$as_me:2297: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2264: found $ac_dir/$ac_word" >&5
++echo "$as_me:2273: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2302,10 +2269,10 @@
+@@ -2302,10 +2278,10 @@
  fi
  ETAGS=$ac_cv_prog_ETAGS
  if test -n "$ETAGS"; then
 -  echo "$as_me:2305: result: $ETAGS" >&5
-+  echo "$as_me:2272: result: $ETAGS" >&5
++  echo "$as_me:2281: result: $ETAGS" >&5
  echo "${ECHO_T}$ETAGS" >&6
  else
 -  echo "$as_me:2308: result: no" >&5
-+  echo "$as_me:2275: result: no" >&5
++  echo "$as_me:2284: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2314,7 +2281,7 @@
+@@ -2314,7 +2290,7 @@
  
  # 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:2317: checking for $ac_word" >&5
-+echo "$as_me:2284: checking for $ac_word" >&5
++echo "$as_me:2293: 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
-@@ -2329,7 +2296,7 @@
+@@ -2329,7 +2305,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_LOWER_TAGS="yes"
 -echo "$as_me:2332: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2299: found $ac_dir/$ac_word" >&5
++echo "$as_me:2308: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2338,17 +2305,17 @@
+@@ -2338,17 +2314,17 @@
  fi
  MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
  if test -n "$MAKE_LOWER_TAGS"; then
 -  echo "$as_me:2341: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:2308: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:2317: result: $MAKE_LOWER_TAGS" >&5
  echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
  else
 -  echo "$as_me:2344: result: no" >&5
-+  echo "$as_me:2311: result: no" >&5
++  echo "$as_me:2320: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -43899 +62667 @@
  set dummy ${ETAGS:-etags}; ac_word=$2
 -echo "$as_me:2351: checking for $ac_word" >&5
-+echo "$as_me:2318: checking for $ac_word" >&5
++echo "$as_me:2327: 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
-@@ -2363,7 +2330,7 @@
+@@ -2363,7 +2339,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_UPPER_TAGS="yes"
 -echo "$as_me:2366: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2333: found $ac_dir/$ac_word" >&5
++echo "$as_me:2342: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2372,10 +2339,10 @@
+@@ -2372,10 +2348,10 @@
  fi
  MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
  if test -n "$MAKE_UPPER_TAGS"; then
 -  echo "$as_me:2375: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:2342: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:2351: result: $MAKE_UPPER_TAGS" >&5
  echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
  else
 -  echo "$as_me:2378: result: no" >&5
-+  echo "$as_me:2345: result: no" >&5
++  echo "$as_me:2354: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2395,14 +2362,14 @@
+@@ -2395,14 +2371,14 @@
         MAKE_LOWER_TAGS="#"
  fi
  
 -echo "$as_me:2398: checking if -lm needed for math functions" >&5
-+echo "$as_me:2365: checking if -lm needed for math functions" >&5
++echo "$as_me:2374: 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
@@ -43938 +62706 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2405 "configure"
-+#line 2372 "configure"
++#line 2381 "configure"
  #include "confdefs.h"
  
         #include <stdio.h>
-@@ -2417,16 +2384,16 @@
+@@ -2417,16 +2393,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:2420: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:2387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2396: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:2423: \$? = $ac_status" >&5
-+  echo "$as_me:2390: \$? = $ac_status" >&5
++  echo "$as_me:2399: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:2426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2402: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2429: \$? = $ac_status" >&5
-+  echo "$as_me:2396: \$? = $ac_status" >&5
++  echo "$as_me:2405: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_need_libm=no
  else
-@@ -2436,13 +2403,15 @@
+@@ -2436,13 +2412,15 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:2439: result: $cf_cv_need_libm" >&5
-+echo "$as_me:2406: result: $cf_cv_need_libm" >&5
++echo "$as_me:2415: result: $cf_cv_need_libm" >&5
  echo "${ECHO_T}$cf_cv_need_libm" >&6
  if test "$cf_cv_need_libm" = yes
@@ -43980 +62748 @@
  CC_SHARED_OPTS=unknown
  CPPFLAGS="$CPPFLAGS"
-@@ -2464,14 +2433,118 @@
+@@ -2464,14 +2442,118 @@
  TEST_ARGS=""
  TEST_DEPS=""
@@ -44000 +62768 @@
 +# into CC.  This will not help with broken scripts that wrap the compiler with
 +# options, but eliminates a more common category of user confusion.
-+echo "$as_me:2450: checking \$CC variable" >&5
++echo "$as_me:2459: checking \$CC variable" >&5
 +echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 +case "$CC" in #(vi
 +*[\ \  ]-[IUD]*)
-+       echo "$as_me:2454: result: broken" >&5
++       echo "$as_me:2463: result: broken" >&5
 +echo "${ECHO_T}broken" >&6
-+       { echo "$as_me:2456: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++       { echo "$as_me:2465: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 +echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 +       # humor him...
@@ -44092 +62860 @@
 +       ;;
 +*)
-+       echo "$as_me:2542: result: ok" >&5
++       echo "$as_me:2551: result: ok" >&5
 +echo "${ECHO_T}ok" >&6
 +       ;;
 +esac
 +
-+echo "$as_me:2547: checking for ${CC:-cc} option to accept ANSI C" >&5
++echo "$as_me:2556: checking for ${CC:-cc} option to accept ANSI C" >&5
  echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
  if test "${cf_cv_ansi_cc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2575,7 +2648,7 @@
+@@ -2575,7 +2657,7 @@
  fi
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2578 "configure"
-+#line 2651 "configure"
++#line 2660 "configure"
  #include "confdefs.h"
  
  #ifndef CC_HAS_PROTOS
-@@ -2596,16 +2669,16 @@
+@@ -2596,16 +2678,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2599: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2681: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2602: \$? = $ac_status" >&5
-+  echo "$as_me:2675: \$? = $ac_status" >&5
++  echo "$as_me:2684: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2687: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2608: \$? = $ac_status" >&5
-+  echo "$as_me:2681: \$? = $ac_status" >&5
++  echo "$as_me:2690: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ansi_cc="$cf_arg"; break
  else
-@@ -2618,7 +2691,7 @@
+@@ -2618,7 +2700,7 @@
  CPPFLAGS="$cf_save_CPPFLAGS"
  
  fi
 -echo "$as_me:2621: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2694: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2703: result: $cf_cv_ansi_cc" >&5
  echo "${ECHO_T}$cf_cv_ansi_cc" >&6
  
  if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2711,7 +2784,7 @@
+@@ -2711,7 +2793,7 @@
  fi
  
  if test "$cf_cv_ansi_cc" = "no"; then
 -       { { echo "$as_me:2714: error: Your compiler does not appear to recognize prototypes.
-+       { { echo "$as_me:2787: error: Your compiler does not appear to recognize prototypes.
++       { { echo "$as_me:2796: error: Your compiler does not appear to recognize prototypes.
  You have the following choices:
         a. adjust your compiler options
         b. get an up-to-date compiler
-@@ -2742,10 +2815,10 @@
+@@ -2742,10 +2824,10 @@
  EOF
  if test "$GCC" = yes
  then
 -       { echo "$as_me:2745: checking for $CC __attribute__ directives..." >&5
-+       { echo "$as_me:2818: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:2827: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <<EOF
 -#line 2748 "${as_me:-configure}"
-+#line 2821 "${as_me:-configure}"
++#line 2830 "${as_me:-configure}"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
-@@ -2794,12 +2867,12 @@
+@@ -2794,12 +2876,12 @@
                         ;;
                 esac
  
 -               if { (eval echo "$as_me:2797: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:2870: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:2879: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2800: \$? = $ac_status" >&5
-+  echo "$as_me:2873: \$? = $ac_status" >&5
++  echo "$as_me:2882: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:2802: result: ... $cf_attribute" >&5
-+                       test -n "$verbose" && echo "$as_me:2875: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:2884: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
                         cat conftest.h >>confdefs.h
                         case $cf_attribute in #(vi
-@@ -2839,7 +2912,7 @@
+@@ -2839,7 +2921,7 @@
  cf_xopen_source=
  
@@ -44187 +62955 @@
         ;;
  cygwin) #(vi
-@@ -2850,6 +2923,7 @@
+@@ -2850,6 +2932,7 @@
         ;;
  darwin*) #(vi
@@ -44195 +62963 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -2867,17 +2941,18 @@
+@@ -2867,17 +2950,18 @@
         ;;
  irix[56].*) #(vi
@@ -44204 +62972 @@
  
 -echo "$as_me:2873: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:2948: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:2957: 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
@@ -44212 +62980 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 2880 "configure"
-+#line 2955 "configure"
++#line 2964 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -2892,16 +2967,16 @@
+@@ -2892,16 +2976,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2970: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2979: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2898: \$? = $ac_status" >&5
-+  echo "$as_me:2973: \$? = $ac_status" >&5
++  echo "$as_me:2982: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2901: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2985: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2904: \$? = $ac_status" >&5
-+  echo "$as_me:2979: \$? = $ac_status" >&5
++  echo "$as_me:2988: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -2910,7 +2985,7 @@
+@@ -2910,7 +2994,7 @@
  cf_save="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 2913 "configure"
-+#line 2988 "configure"
++#line 2997 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -2925,16 +3000,16 @@
+@@ -2925,16 +3009,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2928: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3012: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2931: \$? = $ac_status" >&5
-+  echo "$as_me:3006: \$? = $ac_status" >&5
++  echo "$as_me:3015: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3018: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2937: \$? = $ac_status" >&5
-+  echo "$as_me:3012: \$? = $ac_status" >&5
++  echo "$as_me:3021: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -2949,51 +3024,45 @@
+@@ -2949,51 +3033,45 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:2952: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:3027: result: $cf_cv_gnu_source" >&5
++echo "$as_me:3036: result: $cf_cv_gnu_source" >&5
  echo "${ECHO_T}$cf_cv_gnu_source" >&6
  test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
@@ -44321 +63089 @@
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +
-+echo "$as_me:3049: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3058: 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
@@ -44327 +63095 @@
  else
  
-+echo "${as_me:-configure}:3055: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3064: testing if the symbol is already defined go no further ..." 1>&5
 +
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2989 "configure"
-+#line 3058 "configure"
++#line 3067 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
@@ -44343 +63111 @@
  #endif
    ;
-@@ -3001,32 +3070,44 @@
+@@ -3001,32 +3079,44 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3004: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3073: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3082: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3007: \$? = $ac_status" >&5
-+  echo "$as_me:3076: \$? = $ac_status" >&5
++  echo "$as_me:3085: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3010: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3079: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3088: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3013: \$? = $ac_status" >&5
-+  echo "$as_me:3082: \$? = $ac_status" >&5
++  echo "$as_me:3091: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_cv_xopen_source=no
@@ -44386 +63154 @@
 +        if test "$cf_want_posix_source" = yes ; then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 3103 "configure"
++#line 3112 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
@@ -44398 +63166 @@
  #endif
    ;
-@@ -3034,50 +3115,87 @@
+@@ -3034,50 +3124,87 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3037: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3127: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3040: \$? = $ac_status" >&5
-+  echo "$as_me:3121: \$? = $ac_status" >&5
++  echo "$as_me:3130: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3133: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3046: \$? = $ac_status" >&5
-+  echo "$as_me:3127: \$? = $ac_status" >&5
++  echo "$as_me:3136: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_cv_xopen_source=no
@@ -44429 +63197 @@
 +        fi
 +
-+echo "${as_me:-configure}:3138: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3147: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 +
 +        CFLAGS="$cf_trim_CFLAGS"
 +        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 +
-+echo "${as_me:-configure}:3143: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3152: testing if the second compile does not leave our definition intact error ..." 1>&5
 +
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 3146 "configure"
++#line 3155 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -44452 +63220 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3161: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3170: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3164: \$? = $ac_status" >&5
++  echo "$as_me:3173: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3176: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3170: \$? = $ac_status" >&5
++  echo "$as_me:3179: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -44487 +63255 @@
 -               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
 +fi
-+echo "$as_me:3186: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3195: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
  
@@ -44505 +63273 @@
  case $cf_fix_cppflags in
  no)
-@@ -3150,31 +3268,239 @@
+@@ -3150,33 +3277,241 @@
         EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
  fi
@@ -44512 +63280 @@
 -
 -cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-+fi
- 
+-
 -cf_save_CFLAGS="$CFLAGS"
 -cf_save_CPPFLAGS="$CPPFLAGS"
+-
+-cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \
+-       sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
++fi
+ 
+-cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
+-       sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +       ;;
 +netbsd*) #(vi
@@ -44542 +63318 @@
 +*)
  
--cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \
--       sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
--               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
-+echo "$as_me:3299: checking if we should define _XOPEN_SOURCE" >&5
+-echo "$as_me:3168: 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 "$as_me:3308: checking if we should define _XOPEN_SOURCE" >&5
 +echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 +if test "${cf_cv_xopen_source+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 3306 "configure"
-+#include "confdefs.h"
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:3174: testing if the symbol is already defined go no further ..." 1>&5
+-
+        cat >conftest.$ac_ext <<_ACEOF
+-#line 3177 "configure"
++#line 3315 "configure"
+ #include "confdefs.h"
+-#include <sys/types.h>
 +
 +#include <stdlib.h>
@@ -44571 +63351 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3334: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3328: \$? = $ac_status" >&5
++  echo "$as_me:3337: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3340: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3334: \$? = $ac_status" >&5
++  echo "$as_me:3343: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -44589 +63369 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 3343 "configure"
++#line 3352 "configure"
 +#include "confdefs.h"
 +
@@ -44608 +63388 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3371: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3365: \$? = $ac_status" >&5
++  echo "$as_me:3374: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3377: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3371: \$? = $ac_status" >&5
++  echo "$as_me:3380: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -44632 +63412 @@
 +
 +fi
-+echo "$as_me:3386: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3395: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
 +
@@ -44735 +63515 @@
 +       sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
- 
- cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
-        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
-                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
- 
--echo "$as_me:3168: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:3494: 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 "${as_me:-configure}:3174: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:3500: testing if the symbol is already defined go no further ..." 1>&5
- 
-        cat >conftest.$ac_ext <<_ACEOF
--#line 3177 "configure"
-+#line 3503 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
++
++cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
++       sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
++
++echo "$as_me:3503: 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 "${as_me:-configure}:3509: testing if the symbol is already defined go no further ..." 1>&5
++
++       cat >conftest.$ac_ext <<_ACEOF
++#line 3512 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
  int
-@@ -3189,16 +3515,16 @@
+ main ()
+ {
+@@ -3189,16 +3524,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3192: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3527: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3195: \$? = $ac_status" >&5
-+  echo "$as_me:3521: \$? = $ac_status" >&5
++  echo "$as_me:3530: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3533: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3201: \$? = $ac_status" >&5
-+  echo "$as_me:3527: \$? = $ac_status" >&5
++  echo "$as_me:3536: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_posix_c_source=no
  else
-@@ -3219,7 +3545,7 @@
+@@ -3219,7 +3554,7 @@
          esac
          if test "$cf_want_posix_source" = yes ; then
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 3222 "configure"
-+#line 3548 "configure"
++#line 3557 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -3234,16 +3560,16 @@
+@@ -3234,16 +3569,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3563: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3572: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3240: \$? = $ac_status" >&5
-+  echo "$as_me:3566: \$? = $ac_status" >&5
++  echo "$as_me:3575: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3243: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3578: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3246: \$? = $ac_status" >&5
-+  echo "$as_me:3572: \$? = $ac_status" >&5
++  echo "$as_me:3581: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3254,15 +3580,15 @@
+@@ -3254,15 +3589,15 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
          fi
  
 -echo "${as_me:-configure}:3257: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:3583: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3592: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
  
          CFLAGS="$cf_trim_CFLAGS"
@@ -44818 +63597 @@
  
 -echo "${as_me:-configure}:3262: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:3588: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3597: testing if the second compile does not leave our definition intact error ..." 1>&5
  
          cat >conftest.$ac_ext <<_ACEOF
 -#line 3265 "configure"
-+#line 3591 "configure"
++#line 3600 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -3277,16 +3603,16 @@
+@@ -3277,16 +3612,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3280: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3615: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3283: \$? = $ac_status" >&5
-+  echo "$as_me:3609: \$? = $ac_status" >&5
++  echo "$as_me:3618: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3286: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3621: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3289: \$? = $ac_status" >&5
-+  echo "$as_me:3615: \$? = $ac_status" >&5
++  echo "$as_me:3624: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3302,7 +3628,7 @@
+@@ -3302,7 +3637,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:3305: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:3631: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3640: 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
-@@ -3474,112 +3800,379 @@
+@@ -3474,104 +3809,371 @@
  
  fi
@@ -44870 +63649 @@
 -#line 3485 "configure"
 +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+       echo "$as_me:3804: checking if _XOPEN_SOURCE really is set" >&5
++       echo "$as_me:3813: checking if _XOPEN_SOURCE really is set" >&5
 +echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 3807 "configure"
++#line 3816 "configure"
  #include "confdefs.h"
 -#include <stdarg.h>
@@ -44929 +63708 @@
 -if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3822: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3831: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3537: \$? = $ac_status" >&5
-+  echo "$as_me:3825: \$? = $ac_status" >&5
++  echo "$as_me:3834: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3540: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3837: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3543: \$? = $ac_status" >&5
-+  echo "$as_me:3831: \$? = $ac_status" >&5
++  echo "$as_me:3840: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
@@ -44957 +63736 @@
 -
 -fi
--
++rm -f conftest.$ac_objext conftest.$ac_ext
++       echo "$as_me:3849: result: $cf_XOPEN_SOURCE_set" >&5
++echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
++       if test $cf_XOPEN_SOURCE_set = yes
++       then
++               cat >conftest.$ac_ext <<_ACEOF
++#line 3854 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++int
++main ()
++{
+ 
 -case "x$ac_cv_prog_cc_stdc" in
 -  x|xno)
 -    echo "$as_me:3560: result: none needed" >&5
 -echo "${ECHO_T}none needed" >&6 ;;
--  *)
--    echo "$as_me:3563: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
--
--echo "$as_me:3568: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
--if test "${ac_cv_c_const+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 3574 "configure"
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+       echo "$as_me:3840: result: $cf_XOPEN_SOURCE_set" >&5
-+echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
-+       if test $cf_XOPEN_SOURCE_set = yes
-+       then
-+               cat >conftest.$ac_ext <<_ACEOF
-+#line 3845 "configure"
- #include "confdefs.h"
--
-+#include <stdlib.h>
- int
- main ()
- {
--/* FIXME: Include the comments suggested by Paul. */
--#ifndef __cplusplus
--  /* Ultrix mips cc rejects this.  */
-+
 +#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
 +make an error
@@ -45000 +63761 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3869: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3863: \$? = $ac_status" >&5
++  echo "$as_me:3872: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3875: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3869: \$? = $ac_status" >&5
++  echo "$as_me:3878: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_XOPEN_SOURCE_set_ok=yes
@@ -45020 +63781 @@
 +               if test $cf_XOPEN_SOURCE_set_ok = no
 +               then
-+                       { echo "$as_me:3880: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++                       { echo "$as_me:3889: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 +               fi
 +       else
 +
-+echo "$as_me:3885: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:3894: 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
@@ -45032 +63793 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 3892 "configure"
++#line 3901 "configure"
 +#include "confdefs.h"
 +
@@ -45051 +63812 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3920: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3914: \$? = $ac_status" >&5
++  echo "$as_me:3923: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3926: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3920: \$? = $ac_status" >&5
++  echo "$as_me:3929: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -45069 +63830 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 3929 "configure"
++#line 3938 "configure"
 +#include "confdefs.h"
 +
@@ -45088 +63849 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3948: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3957: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3951: \$? = $ac_status" >&5
++  echo "$as_me:3960: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3954: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3963: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3957: \$? = $ac_status" >&5
++  echo "$as_me:3966: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -45112 +63873 @@
 +
 +fi
-+echo "$as_me:3972: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3981: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
 +
@@ -45210 +63971 @@
 +fi
 +
-+echo "$as_me:4070: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:4079: 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
@@ -45218 +63979 @@
 +ac_save_CC=$CC
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 4078 "configure"
++#line 4087 "configure"
 +#include "confdefs.h"
 +#include <stdarg.h>
@@ -45267 +64028 @@
 +  CC="$ac_save_CC $ac_arg"
 +  rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4136: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4130: \$? = $ac_status" >&5
++  echo "$as_me:4139: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4142: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4136: \$? = $ac_status" >&5
++  echo "$as_me:4145: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_prog_cc_stdc=$ac_arg
@@ -45293 +64054 @@
 +case "x$ac_cv_prog_cc_stdc" in
 +  x|xno)
-+    echo "$as_me:4153: result: none needed" >&5
++    echo "$as_me:4162: result: none needed" >&5
 +echo "${ECHO_T}none needed" >&6 ;;
-+  *)
-+    echo "$as_me:4156: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+esac
-+
-+echo "$as_me:4161: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+if test "${ac_cv_c_const+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 4167 "configure"
-+#include "confdefs.h"
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-   typedef int charset[2];
-   const charset x;
-   /* SunOS 4.1.1 cc rejects this.  */
-@@ -3629,16 +4222,16 @@
+   *)
+-    echo "$as_me:3563: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:4165: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+ 
+-echo "$as_me:3568: checking for an ANSI C-conforming const" >&5
++echo "$as_me:4170: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3574 "configure"
++#line 4176 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3629,16 +4231,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3632: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4225: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3635: \$? = $ac_status" >&5
-+  echo "$as_me:4228: \$? = $ac_status" >&5
++  echo "$as_me:4237: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3638: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4240: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3641: \$? = $ac_status" >&5
-+  echo "$as_me:4234: \$? = $ac_status" >&5
++  echo "$as_me:4243: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -3648,7 +4241,7 @@
+@@ -3648,7 +4250,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3651: result: $ac_cv_c_const" >&5
-+echo "$as_me:4244: result: $ac_cv_c_const" >&5
++echo "$as_me:4253: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -3658,7 +4251,7 @@
+@@ -3658,7 +4260,7 @@
  
  fi
  
 -echo "$as_me:3661: checking for signal global datatype" >&5
-+echo "$as_me:4254: checking for signal global datatype" >&5
++echo "$as_me:4263: 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
-@@ -3670,7 +4263,7 @@
+@@ -3670,7 +4272,7 @@
                 "int"
         do
         cat >conftest.$ac_ext <<_ACEOF
 -#line 3673 "configure"
-+#line 4266 "configure"
++#line 4275 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -3693,16 +4286,16 @@
+@@ -3693,16 +4295,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4298: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3699: \$? = $ac_status" >&5
-+  echo "$as_me:4292: \$? = $ac_status" >&5
++  echo "$as_me:4301: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3702: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4304: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3705: \$? = $ac_status" >&5
-+  echo "$as_me:4298: \$? = $ac_status" >&5
++  echo "$as_me:4307: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sig_atomic_t=$cf_type
  else
-@@ -3716,13 +4309,13 @@
+@@ -3716,13 +4318,13 @@
  
  fi
  
 -echo "$as_me:3719: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:4312: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:4321: 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
@@ -45400 +64156 @@
  
 -echo "$as_me:3725: checking if you want to see long compiling messages" >&5
-+echo "$as_me:4318: checking if you want to see long compiling messages" >&5
++echo "$as_me:4327: 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.
-@@ -3756,22 +4349,22 @@
+@@ -3756,22 +4358,22 @@
      ECHO_CC=''
  
  fi;
 -echo "$as_me:3759: result: $enableval" >&5
-+echo "$as_me:4352: result: $enableval" >&5
++echo "$as_me:4361: result: $enableval" >&5
  echo "${ECHO_T}$enableval" >&6
  
@@ -45415 +64171 @@
  if test "$GCC" = yes ; then
 -       echo "$as_me:3764: checking version of $CC" >&5
-+       echo "$as_me:4357: checking version of $CC" >&5
++       echo "$as_me:4366: 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/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
         test -z "$GCC_VERSION" && GCC_VERSION=unknown
 -       echo "$as_me:3768: result: $GCC_VERSION" >&5
-+       echo "$as_me:4361: result: $GCC_VERSION" >&5
++       echo "$as_me:4370: result: $GCC_VERSION" >&5
  echo "${ECHO_T}$GCC_VERSION" >&6
  fi
@@ -45427 +64183 @@
  then
 -echo "$as_me:3774: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:4367: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:4376: 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.
-@@ -3788,7 +4381,7 @@
+@@ -3788,7 +4390,7 @@
    with_warnings=no
  
  fi;
 -echo "$as_me:3791: result: $with_warnings" >&5
-+echo "$as_me:4384: result: $with_warnings" >&5
++echo "$as_me:4393: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  if test "$with_warnings" = "yes"
  then
-@@ -3811,10 +4404,10 @@
+@@ -3811,10 +4413,10 @@
  EOF
  if test "$GCC" = yes
  then
 -       { echo "$as_me:3814: checking for $CC __attribute__ directives..." >&5
-+       { echo "$as_me:4407: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:4416: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <<EOF
 -#line 3817 "${as_me:-configure}"
-+#line 4410 "${as_me:-configure}"
++#line 4419 "${as_me:-configure}"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
-@@ -3863,12 +4456,12 @@
+@@ -3863,12 +4465,12 @@
                         ;;
                 esac
  
 -               if { (eval echo "$as_me:3866: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:4459: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:4468: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3869: \$? = $ac_status" >&5
-+  echo "$as_me:4462: \$? = $ac_status" >&5
++  echo "$as_me:4471: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:3871: result: ... $cf_attribute" >&5
-+                       test -n "$verbose" && echo "$as_me:4464: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:4473: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
                         cat conftest.h >>confdefs.h
                         case $cf_attribute in #(vi
-@@ -3908,12 +4501,12 @@
+@@ -3908,19 +4510,70 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:3911: checking if this is really Intel C compiler" >&5
-+               echo "$as_me:4504: checking if this is really Intel C compiler" >&5
++               echo "$as_me:4513: 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"
@@ -45480 +64236 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 3916 "configure"
-+#line 4509 "configure"
++#line 4518 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __INTEL_COMPILER
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:4535: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:4538: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:4541: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:4544: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  INTEL_COMPILER=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++               CFLAGS="$cf_save_CFLAGS"
++               echo "$as_me:4555: result: $INTEL_COMPILER" >&5
++echo "${ECHO_T}$INTEL_COMPILER" >&6
++               ;;
++       esac
++fi
++
++CLANG_COMPILER=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:4564: checking if this is really Clang C compiler" >&5
++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CFLAGS"
++       CFLAGS="$CFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 4569 "configure"
  #include "confdefs.h"
  
  int
-@@ -3930,16 +4523,16 @@
+ main ()
+ {
+ 
+-#ifdef __INTEL_COMPILER
++#ifdef __clang__
+ #else
+ make an error
+ #endif
+@@ -3930,34 +4583,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3933: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4586: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3936: \$? = $ac_status" >&5
-+  echo "$as_me:4529: \$? = $ac_status" >&5
++  echo "$as_me:4589: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3939: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4592: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3942: \$? = $ac_status" >&5
-+  echo "$as_me:4535: \$? = $ac_status" >&5
++  echo "$as_me:4595: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -3950,14 +4543,14 @@
+-  INTEL_COMPILER=yes
+-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
++  CLANG_COMPILER=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
-                CFLAGS="$cf_save_CFLAGS"
+-               CFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:3953: result: $INTEL_COMPILER" >&5
-+               echo "$as_me:4546: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
-                ;;
-        esac
+-echo "${ECHO_T}$INTEL_COMPILER" >&6
+-               ;;
+-       esac
++       CFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:4606: result: $CLANG_COMPILER" >&5
++echo "${ECHO_T}$CLANG_COMPILER" >&6
  fi
  
  cat > conftest.$ac_ext <<EOF
 -#line 3960 "${as_me:-configure}"
-+#line 4553 "${as_me:-configure}"
++#line 4611 "${as_me:-configure}"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -3974,7 +4567,7 @@
+@@ -3974,7 +4625,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #279: controlling expression is constant
  
 -       { echo "$as_me:3977: checking for $CC warning options..." >&5
-+       { echo "$as_me:4570: checking for $CC warning options..." >&5
++       { echo "$as_me:4628: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS="-Wall"
-@@ -3990,12 +4583,12 @@
+@@ -3990,12 +4641,12 @@
                 wd981
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:3993: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:4586: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:4644: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3996: \$? = $ac_status" >&5
-+  echo "$as_me:4589: \$? = $ac_status" >&5
++  echo "$as_me:4647: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:3998: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:4591: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:4649: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                 fi
-@@ -4004,7 +4597,7 @@
+@@ -4004,7 +4655,7 @@
  
  elif test "$GCC" = yes
  then
 -       { echo "$as_me:4007: checking for $CC warning options..." >&5
-+       { echo "$as_me:4600: checking for $CC warning options..." >&5
++       { echo "$as_me:4658: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS=
-@@ -4024,12 +4617,12 @@
+@@ -4024,12 +4675,12 @@
                 Wundef $cf_warn_CONST
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:4027: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:4620: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:4678: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4030: \$? = $ac_status" >&5
-+  echo "$as_me:4623: \$? = $ac_status" >&5
++  echo "$as_me:4681: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:4032: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:4625: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:4683: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         case $cf_opt in #(vi
                         Wcast-qual) #(vi
-@@ -4040,7 +4633,7 @@
+@@ -4040,7 +4691,17 @@
                                 [34].*)
                                         test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
  
 -echo "${as_me:-configure}:4043: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4636: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:4694: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++
++                                       continue;;
++                               esac
++                               ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [12].*)
++                                       test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
++
++echo "${as_me:-configure}:4704: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
                                         continue;;
                                 esac
-@@ -4056,7 +4649,7 @@
+@@ -4056,7 +4717,7 @@
  fi
  fi
  
 -echo "$as_me:4059: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:4652: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:4720: 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.
-@@ -4072,7 +4665,7 @@
+@@ -4072,7 +4733,7 @@
  else
    with_dmalloc=
  fi;
 -echo "$as_me:4075: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:4668: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:4736: result: ${with_dmalloc:-no}" >&5
  echo "${ECHO_T}${with_dmalloc:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -4166,23 +4759,23 @@
+@@ -4166,23 +4827,23 @@
  esac
  
  if test "$with_dmalloc" = yes ; then
 -       echo "$as_me:4169: checking for dmalloc.h" >&5
-+       echo "$as_me:4762: checking for dmalloc.h" >&5
++       echo "$as_me:4830: 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
@@ -45611 +64443 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4175 "configure"
-+#line 4768 "configure"
++#line 4836 "configure"
  #include "confdefs.h"
  #include <dmalloc.h>
  _ACEOF
 -if { (eval echo "$as_me:4179: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4772: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4840: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -45623 +64455 @@
    cat conftest.err >&5
 -  echo "$as_me:4185: \$? = $ac_status" >&5
-+  echo "$as_me:4778: \$? = $ac_status" >&5
++  echo "$as_me:4846: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4201,11 +4794,11 @@
+@@ -4201,11 +4862,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4204: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:4797: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:4865: result: $ac_cv_header_dmalloc_h" >&5
  echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
  if test $ac_cv_header_dmalloc_h = yes; then
  
 -echo "$as_me:4208: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:4801: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:4869: 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
-@@ -4213,7 +4806,7 @@
+@@ -4213,7 +4874,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4216 "configure"
-+#line 4809 "configure"
++#line 4877 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4232,16 +4825,16 @@
+@@ -4232,16 +4893,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4235: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4896: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4238: \$? = $ac_status" >&5
-+  echo "$as_me:4831: \$? = $ac_status" >&5
++  echo "$as_me:4899: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4241: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4902: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4244: \$? = $ac_status" >&5
-+  echo "$as_me:4837: \$? = $ac_status" >&5
++  echo "$as_me:4905: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dmalloc_dmalloc_debug=yes
  else
-@@ -4252,7 +4845,7 @@
+@@ -4252,7 +4913,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:4255: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:4848: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:4916: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
  echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
  if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    cat >>confdefs.h <<EOF
-@@ -4267,7 +4860,7 @@
+@@ -4267,7 +4928,7 @@
  
  fi
  
 -echo "$as_me:4270: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:4863: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:4931: 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.
-@@ -4283,7 +4876,7 @@
+@@ -4283,7 +4944,7 @@
  else
    with_dbmalloc=
  fi;
 -echo "$as_me:4286: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:4879: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:4947: result: ${with_dbmalloc:-no}" >&5
  echo "${ECHO_T}${with_dbmalloc:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -4377,23 +4970,23 @@
+@@ -4377,23 +5038,23 @@
  esac
  
  if test "$with_dbmalloc" = yes ; then
 -       echo "$as_me:4380: checking for dbmalloc.h" >&5
-+       echo "$as_me:4973: checking for dbmalloc.h" >&5
++       echo "$as_me:5041: 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
@@ -45710 +64542 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4386 "configure"
-+#line 4979 "configure"
++#line 5047 "configure"
  #include "confdefs.h"
  #include <dbmalloc.h>
  _ACEOF
 -if { (eval echo "$as_me:4390: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4983: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5051: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -45722 +64554 @@
    cat conftest.err >&5
 -  echo "$as_me:4396: \$? = $ac_status" >&5
-+  echo "$as_me:4989: \$? = $ac_status" >&5
++  echo "$as_me:5057: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4412,11 +5005,11 @@
+@@ -4412,11 +5073,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4415: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:5008: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:5076: result: $ac_cv_header_dbmalloc_h" >&5
  echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
  if test $ac_cv_header_dbmalloc_h = yes; then
  
 -echo "$as_me:4419: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:5012: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:5080: 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
-@@ -4424,7 +5017,7 @@
+@@ -4424,7 +5085,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4427 "configure"
-+#line 5020 "configure"
++#line 5088 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4443,16 +5036,16 @@
+@@ -4443,16 +5104,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4446: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5039: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4449: \$? = $ac_status" >&5
-+  echo "$as_me:5042: \$? = $ac_status" >&5
++  echo "$as_me:5110: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4452: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5113: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4455: \$? = $ac_status" >&5
-+  echo "$as_me:5048: \$? = $ac_status" >&5
++  echo "$as_me:5116: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dbmalloc_debug_malloc=yes
  else
-@@ -4463,7 +5056,7 @@
+@@ -4463,7 +5124,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:4466: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:5059: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:5127: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
  echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
  if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    cat >>confdefs.h <<EOF
-@@ -4478,7 +5071,7 @@
+@@ -4478,7 +5139,7 @@
  
  fi
  
 -echo "$as_me:4481: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:5074: checking if you want to use valgrind for testing" >&5
++echo "$as_me:5142: 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.
-@@ -4494,7 +5087,7 @@
+@@ -4494,7 +5155,7 @@
  else
    with_valgrind=
  fi;
 -echo "$as_me:4497: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:5090: result: ${with_valgrind:-no}" >&5
++echo "$as_me:5158: result: ${with_valgrind:-no}" >&5
  echo "${ECHO_T}${with_valgrind:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -4587,7 +5180,7 @@
+@@ -4587,7 +5248,7 @@
         ;;
  esac
  
 -echo "$as_me:4590: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:5183: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:5251: 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.
-@@ -4597,7 +5190,7 @@
+@@ -4597,7 +5258,7 @@
  else
    : ${with_no_leaks:=no}
  fi;
 -echo "$as_me:4600: result: $with_no_leaks" >&5
-+echo "$as_me:5193: result: $with_no_leaks" >&5
++echo "$as_me:5261: result: $with_no_leaks" >&5
  echo "${ECHO_T}$with_no_leaks" >&6
  
  if test "$with_no_leaks" = yes ; then
-@@ -4611,7 +5204,27 @@
+@@ -4611,7 +5272,27 @@
  
  fi
  
 -echo "$as_me:4614: checking for specific curses-directory" >&5
-+echo "$as_me:5207: checking if you want to check for wide-character functions" >&5
++echo "$as_me:5275: 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
 +
@@ -45837 +64669 @@
 +
 +fi;
-+echo "$as_me:5224: result: $cf_enable_widec" >&5
++echo "$as_me:5292: result: $cf_enable_widec" >&5
 +echo "${ECHO_T}$cf_enable_widec" >&6
 +
-+echo "$as_me:5227: checking for specific curses-directory" >&5
++echo "$as_me:5295: 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.
-@@ -4621,7 +5234,7 @@
+@@ -4621,7 +5302,7 @@
  else
    cf_cv_curses_dir=no
  fi;
 -echo "$as_me:4624: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:5237: result: $cf_cv_curses_dir" >&5
++echo "$as_me:5305: result: $cf_cv_curses_dir" >&5
  echo "${ECHO_T}$cf_cv_curses_dir" >&6
  
  if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
-@@ -4652,7 +5265,7 @@
+@@ -4640,7 +5321,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -4652,7 +5333,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:4655: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:5268: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:5336: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -4685,7 +5298,7 @@
+@@ -4685,7 +5366,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4688 "configure"
-+#line 5301 "configure"
++#line 5369 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4697,16 +5310,16 @@
+@@ -4697,16 +5378,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4700: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5381: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4703: \$? = $ac_status" >&5
-+  echo "$as_me:5316: \$? = $ac_status" >&5
++  echo "$as_me:5384: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4706: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5387: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4709: \$? = $ac_status" >&5
-+  echo "$as_me:5322: \$? = $ac_status" >&5
++  echo "$as_me:5390: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4723,7 +5336,7 @@
+@@ -4723,7 +5404,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4726: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5339: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5407: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4757,7 +5370,7 @@
+@@ -4757,7 +5438,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:4760: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5373: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5441: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -4768,12 +5381,10 @@
+@@ -4768,12 +5449,10 @@
         fi
  fi
@@ -45922 +64763 @@
 +cf_cv_screen=curses
 +
-+echo "$as_me:5386: checking for specified curses library type" >&5
++echo "$as_me:5454: checking for specified curses library type" >&5
 +echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
  
  # Check whether --with-ncursesw or --without-ncursesw was given.
  if test "${with_ncursesw+set}" = set; then
-@@ -4791,14 +5402,31 @@
+@@ -4791,14 +5470,31 @@
  if test "${with_pdcurses+set}" = set; then
    withval="$with_pdcurses"
@@ -45951 +64792 @@
 -case $cf_cv_screen in
 -curses)
-+echo "$as_me:5423: result: $cf_cv_screen" >&5
++echo "$as_me:5491: result: $cf_cv_screen" >&5
 +echo "${ECHO_T}$cf_cv_screen" >&6
 +
@@ -45958 +64799 @@
  
 -echo "$as_me:4801: checking for extra include directories" >&5
-+echo "$as_me:5429: checking for extra include directories" >&5
++echo "$as_me:5497: 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
-@@ -4807,22 +5435,28 @@
+@@ -4807,22 +5503,28 @@
  cf_cv_curses_incdir=no
  case $host_os in #(vi
@@ -45989 +64830 @@
  fi
 -echo "$as_me:4821: result: $cf_cv_curses_incdir" >&5
-+echo "$as_me:5455: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:5523: result: $cf_cv_curses_incdir" >&5
  echo "${ECHO_T}$cf_cv_curses_incdir" >&6
  test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
  
 -echo "$as_me:4825: checking if we have identified curses headers" >&5
-+echo "$as_me:5459: checking if we have identified curses headers" >&5
++echo "$as_me:5527: 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
-@@ -4830,11 +5464,11 @@
+@@ -4830,11 +5532,11 @@
  
  cf_cv_ncurses_header=none
@@ -46009 +64850 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4837 "configure"
-+#line 5471 "configure"
++#line 5539 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -4846,16 +5480,16 @@
+@@ -4846,16 +5548,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4849: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5483: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5551: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4852: \$? = $ac_status" >&5
-+  echo "$as_me:5486: \$? = $ac_status" >&5
++  echo "$as_me:5554: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4855: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5557: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4858: \$? = $ac_status" >&5
-+  echo "$as_me:5492: \$? = $ac_status" >&5
++  echo "$as_me:5560: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -4866,11 +5500,11 @@
+@@ -4866,11 +5568,11 @@
  done
  
  fi
 -echo "$as_me:4869: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:5503: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5571: result: $cf_cv_ncurses_header" >&5
  echo "${ECHO_T}$cf_cv_ncurses_header" >&6
  
  if test "$cf_cv_ncurses_header" = none ; then
 -       { { echo "$as_me:4873: error: No curses header-files found" >&5
-+       { { echo "$as_me:5507: error: No curses header-files found" >&5
++       { { echo "$as_me:5575: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -4880,23 +5514,23 @@
+@@ -4880,23 +5582,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:4883: checking for $ac_header" >&5
-+echo "$as_me:5517: checking for $ac_header" >&5
++echo "$as_me:5585: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -46060 +64901 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4889 "configure"
-+#line 5523 "configure"
++#line 5591 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:4893: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:5527: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5595: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -46072 +64913 @@
    cat conftest.err >&5
 -  echo "$as_me:4899: \$? = $ac_status" >&5
-+  echo "$as_me:5533: \$? = $ac_status" >&5
++  echo "$as_me:5601: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4915,7 +5549,7 @@
+@@ -4915,7 +5617,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4918: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:5552: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:5620: 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
-@@ -4925,7 +5559,7 @@
+@@ -4925,7 +5627,7 @@
  fi
  done
  
 -echo "$as_me:4928: checking for terminfo header" >&5
-+echo "$as_me:5562: checking for terminfo header" >&5
++echo "$as_me:5630: 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
-@@ -4943,7 +5577,7 @@
+@@ -4943,7 +5645,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4946 "configure"
-+#line 5580 "configure"
++#line 5648 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4958,16 +5592,16 @@
+@@ -4958,16 +5660,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4961: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5663: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4964: \$? = $ac_status" >&5
-+  echo "$as_me:5598: \$? = $ac_status" >&5
++  echo "$as_me:5666: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4967: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5669: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4970: \$? = $ac_status" >&5
-+  echo "$as_me:5604: \$? = $ac_status" >&5
++  echo "$as_me:5672: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -4983,7 +5617,7 @@
+@@ -4983,7 +5685,7 @@
  done
  
  fi
 -echo "$as_me:4986: result: $cf_cv_term_header" >&5
-+echo "$as_me:5620: result: $cf_cv_term_header" >&5
++echo "$as_me:5688: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -5012,7 +5646,7 @@
+@@ -5012,7 +5714,7 @@
         ;;
  esac
  
 -echo "$as_me:5015: checking for ncurses version" >&5
-+echo "$as_me:5649: checking for ncurses version" >&5
++echo "$as_me:5717: 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
-@@ -5038,10 +5672,10 @@
+@@ -5038,10 +5740,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:5041: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:5675: \"$cf_try\"") >&5
++       { (eval echo "$as_me:5743: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5044: \$? = $ac_status" >&5
-+  echo "$as_me:5678: \$? = $ac_status" >&5
++  echo "$as_me:5746: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -5051,7 +5685,7 @@
+@@ -5051,7 +5753,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5054 "configure"
-+#line 5688 "configure"
++#line 5756 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5076,15 +5710,15 @@
+@@ -5076,15 +5778,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:5079: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5713: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5781: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5082: \$? = $ac_status" >&5
-+  echo "$as_me:5716: \$? = $ac_status" >&5
++  echo "$as_me:5784: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:5084: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5786: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5087: \$? = $ac_status" >&5
-+  echo "$as_me:5721: \$? = $ac_status" >&5
++  echo "$as_me:5789: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5098,16 +5732,16 @@
+@@ -5098,16 +5800,16 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:5101: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:5735: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5803: result: $cf_cv_ncurses_version" >&5
  echo "${ECHO_T}$cf_cv_ncurses_version" >&6
  test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
@@ -46196 +65037 @@
  
 -echo "$as_me:5107: checking if we have identified curses libraries" >&5
-+echo "$as_me:5741: checking if we have identified curses libraries" >&5
++echo "$as_me:5809: checking if we have identified curses libraries" >&5
  echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5110 "configure"
-+#line 5744 "configure"
++#line 5812 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5119,16 +5753,16 @@
+@@ -5119,16 +5821,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5824: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5125: \$? = $ac_status" >&5
-+  echo "$as_me:5759: \$? = $ac_status" >&5
++  echo "$as_me:5827: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5830: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5131: \$? = $ac_status" >&5
-+  echo "$as_me:5765: \$? = $ac_status" >&5
++  echo "$as_me:5833: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -5137,13 +5771,13 @@
+@@ -5137,13 +5839,13 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -echo "$as_me:5140: result: $cf_result" >&5
-+echo "$as_me:5774: result: $cf_result" >&5
++echo "$as_me:5842: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
@@ -46237 +65078 @@
  freebsd*) #(vi
 -    echo "$as_me:5146: checking for tgoto in -lmytinfo" >&5
-+    echo "$as_me:5780: checking for tgoto in -lmytinfo" >&5
++    echo "$as_me:5848: 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
-@@ -5151,7 +5785,7 @@
+@@ -5151,7 +5853,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5154 "configure"
-+#line 5788 "configure"
++#line 5856 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5170,16 +5804,16 @@
+@@ -5170,16 +5872,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5173: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5807: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5875: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5176: \$? = $ac_status" >&5
-+  echo "$as_me:5810: \$? = $ac_status" >&5
++  echo "$as_me:5878: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5179: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5881: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5182: \$? = $ac_status" >&5
-+  echo "$as_me:5816: \$? = $ac_status" >&5
++  echo "$as_me:5884: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -5190,7 +5824,7 @@
+@@ -5190,7 +5892,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5193: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:5827: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5895: result: $ac_cv_lib_mytinfo_tgoto" >&5
  echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
  if test $ac_cv_lib_mytinfo_tgoto = yes; then
    LIBS="-lmytinfo $LIBS"
-@@ -5198,7 +5832,13 @@
+@@ -5198,7 +5900,13 @@
  
      ;;
@@ -46291 +65132 @@
 +       if test "x$cf_cv_screen" = "xcurses_colr"
 +       then
-+               echo "$as_me:5841: checking for initscr in -lcur_colr" >&5
++               echo "$as_me:5909: 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
-@@ -5206,7 +5846,7 @@
+@@ -5206,7 +5914,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcur_colr  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5209 "configure"
-+#line 5849 "configure"
++#line 5917 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5225,16 +5865,16 @@
+@@ -5225,16 +5933,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5228: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5936: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5231: \$? = $ac_status" >&5
-+  echo "$as_me:5871: \$? = $ac_status" >&5
++  echo "$as_me:5939: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5234: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5942: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5237: \$? = $ac_status" >&5
-+  echo "$as_me:5877: \$? = $ac_status" >&5
++  echo "$as_me:5945: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_cur_colr_initscr=yes
  else
-@@ -5245,16 +5885,16 @@
+@@ -5245,16 +5953,16 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5248: result: $ac_cv_lib_cur_colr_initscr" >&5
-+echo "$as_me:5888: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:5956: result: $ac_cv_lib_cur_colr_initscr" >&5
  echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
  if test $ac_cv_lib_cur_colr_initscr = yes; then
@@ -46342 +65183 @@
  
 -    echo "$as_me:5257: checking for initscr in -lHcurses" >&5
-+               echo "$as_me:5897: checking for initscr in -lHcurses" >&5
++               echo "$as_me:5965: 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
-@@ -5262,7 +5902,7 @@
+@@ -5262,7 +5970,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lHcurses  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5265 "configure"
-+#line 5905 "configure"
++#line 5973 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5281,16 +5921,16 @@
+@@ -5281,16 +5989,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5284: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5992: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5287: \$? = $ac_status" >&5
-+  echo "$as_me:5927: \$? = $ac_status" >&5
++  echo "$as_me:5995: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5290: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5998: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5293: \$? = $ac_status" >&5
-+  echo "$as_me:5933: \$? = $ac_status" >&5
++  echo "$as_me:6001: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_Hcurses_initscr=yes
  else
-@@ -5301,19 +5941,20 @@
+@@ -5301,19 +6009,20 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5304: result: $ac_cv_lib_Hcurses_initscr" >&5
-+echo "$as_me:5944: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:6012: result: $ac_cv_lib_Hcurses_initscr" >&5
  echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
  if test $ac_cv_lib_Hcurses_initscr = yes; then
@@ -46402 +65243 @@
  linux*)
         case `arch 2>/dev/null` in
-@@ -5340,7 +5981,7 @@
+@@ -5340,7 +6049,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:5343: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5984: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6052: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -5369,7 +6010,7 @@
+@@ -5369,7 +6078,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:5372: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:6013: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6081: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -5400,7 +6041,7 @@
+@@ -5400,7 +6109,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:5403: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:6044: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6112: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -5412,7 +6053,9 @@
+@@ -5412,7 +6121,9 @@
         esac
      ;;
@@ -46440 +65281 @@
  if test -n "/usr/5lib" ; then
    for cf_add_libdir in /usr/5lib
-@@ -5433,7 +6076,7 @@
+@@ -5433,7 +6144,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:5436: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:6079: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6147: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -5441,7 +6084,8 @@
+@@ -5441,7 +6152,8 @@
    done
  fi
@@ -46459 +65300 @@
      ac_cv_func_initscr=yes
      ;;
-@@ -5461,13 +6105,13 @@
+@@ -5461,13 +6173,13 @@
  
      # Check for library containing tgoto.  Do this before curses library
      # because it may be needed to link the test-case for initscr.
 -    echo "$as_me:5464: checking for tgoto" >&5
-+    echo "$as_me:6108: checking for tgoto" >&5
++    echo "$as_me:6176: checking for tgoto" >&5
  echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
  if test "${ac_cv_func_tgoto+set}" = set; then
@@ -46471 +65312 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5470 "configure"
-+#line 6114 "configure"
++#line 6182 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char tgoto (); below.  */
-@@ -5498,16 +6142,16 @@
+@@ -5490,7 +6202,7 @@
+ #if defined (__stub_tgoto) || defined (__stub___tgoto)
+ choke me
+ #else
+-f = tgoto;
++f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -5498,16 +6210,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6213: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5504: \$? = $ac_status" >&5
-+  echo "$as_me:6148: \$? = $ac_status" >&5
++  echo "$as_me:6216: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6219: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5510: \$? = $ac_status" >&5
-+  echo "$as_me:6154: \$? = $ac_status" >&5
++  echo "$as_me:6222: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_tgoto=yes
  else
-@@ -5517,16 +6161,16 @@
+@@ -5517,16 +6229,16 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:5520: result: $ac_cv_func_tgoto" >&5
-+echo "$as_me:6164: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:6232: result: $ac_cv_func_tgoto" >&5
  echo "${ECHO_T}$ac_cv_func_tgoto" >&6
  if test $ac_cv_func_tgoto = yes; then
@@ -46508 +65358 @@
  
 -        for cf_term_lib in $cf_check_list termcap termlib unknown
-+        for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
++        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:5529: checking for tgoto in -l$cf_term_lib" >&5
-+echo "$as_me:6173: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:6241: 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
-@@ -5534,7 +6178,7 @@
+@@ -5534,7 +6246,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_term_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5537 "configure"
-+#line 6181 "configure"
++#line 6249 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5553,16 +6197,16 @@
+@@ -5553,16 +6265,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5556: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6268: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5559: \$? = $ac_status" >&5
-+  echo "$as_me:6203: \$? = $ac_status" >&5
++  echo "$as_me:6271: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5562: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6274: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5565: \$? = $ac_status" >&5
-+  echo "$as_me:6209: \$? = $ac_status" >&5
++  echo "$as_me:6277: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -5573,7 +6217,7 @@
+@@ -5573,7 +6285,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5576: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:6220: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:6288: result: `eval echo '${'$as_ac_Lib'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    break
-@@ -5588,7 +6232,7 @@
+@@ -5588,7 +6300,7 @@
         for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
      do
          as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
 -echo "$as_me:5591: checking for initscr in -l$cf_curs_lib" >&5
-+echo "$as_me:6235: checking for initscr in -l$cf_curs_lib" >&5
++echo "$as_me:6303: checking for initscr in -l$cf_curs_lib" >&5
  echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5596,7 +6240,7 @@
+@@ -5596,7 +6308,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_curs_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5599 "configure"
-+#line 6243 "configure"
++#line 6311 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5615,16 +6259,16 @@
+@@ -5615,16 +6327,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5618: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6330: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5621: \$? = $ac_status" >&5
-+  echo "$as_me:6265: \$? = $ac_status" >&5
++  echo "$as_me:6333: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5624: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5627: \$? = $ac_status" >&5
-+  echo "$as_me:6271: \$? = $ac_status" >&5
++  echo "$as_me:6339: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -5635,23 +6279,23 @@
+@@ -5635,23 +6347,23 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5638: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:6282: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:6350: 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
@@ -46607 +65457 @@
      done
 -    test $cf_curs_lib = unknown && { { echo "$as_me:5645: error: no curses library found" >&5
-+    test $cf_curs_lib = unknown && { { echo "$as_me:6289: error: no curses library found" >&5
++    test $cf_curs_lib = unknown && { { echo "$as_me:6357: error: no curses library found" >&5
  echo "$as_me: error: no curses library found" >&2;}
     { (exit 1); exit 1; }; }
@@ -46614 +65464 @@
      if test "$cf_term_lib" = unknown ; then
 -        echo "$as_me:5651: checking if we can link with $cf_curs_lib library" >&5
-+        echo "$as_me:6295: checking if we can link with $cf_curs_lib library" >&5
++        echo "$as_me:6363: checking if we can link with $cf_curs_lib library" >&5
  echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
          cat >conftest.$ac_ext <<_ACEOF
 -#line 5654 "configure"
-+#line 6298 "configure"
++#line 6366 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5663,16 +6307,16 @@
+@@ -5663,16 +6375,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5666: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6310: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6378: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5669: \$? = $ac_status" >&5
-+  echo "$as_me:6313: \$? = $ac_status" >&5
++  echo "$as_me:6381: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6384: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5675: \$? = $ac_status" >&5
-+  echo "$as_me:6319: \$? = $ac_status" >&5
++  echo "$as_me:6387: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -5681,18 +6325,18 @@
+@@ -5681,18 +6393,18 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -        echo "$as_me:5684: result: $cf_result" >&5
-+        echo "$as_me:6328: result: $cf_result" >&5
++        echo "$as_me:6396: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
 -        test $cf_result = no && { { echo "$as_me:5686: error: Cannot link curses library" >&5
-+        test $cf_result = no && { { echo "$as_me:6330: error: Cannot link curses library" >&5
++        test $cf_result = no && { { echo "$as_me:6398: error: Cannot link curses library" >&5
  echo "$as_me: error: Cannot link curses library" >&2;}
     { (exit 1); exit 1; }; }
@@ -46658 +65508 @@
      elif test "$cf_term_lib" != predefined ; then
 -        echo "$as_me:5692: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
-+        echo "$as_me:6336: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++        echo "$as_me:6404: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
  echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
          cat >conftest.$ac_ext <<_ACEOF
 -#line 5695 "configure"
-+#line 6339 "configure"
++#line 6407 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5704,16 +6348,16 @@
+@@ -5704,16 +6416,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6419: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5710: \$? = $ac_status" >&5
-+  echo "$as_me:6354: \$? = $ac_status" >&5
++  echo "$as_me:6422: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5713: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6425: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5716: \$? = $ac_status" >&5
-+  echo "$as_me:6360: \$? = $ac_status" >&5
++  echo "$as_me:6428: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=no
  else
-@@ -5722,7 +6366,7 @@
+@@ -5722,7 +6434,7 @@
  
              LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
              cat >conftest.$ac_ext <<_ACEOF
 -#line 5725 "configure"
-+#line 6369 "configure"
++#line 6437 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5734,16 +6378,16 @@
+@@ -5734,16 +6446,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5737: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6381: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6449: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5740: \$? = $ac_status" >&5
-+  echo "$as_me:6384: \$? = $ac_status" >&5
++  echo "$as_me:6452: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6455: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5746: \$? = $ac_status" >&5
-+  echo "$as_me:6390: \$? = $ac_status" >&5
++  echo "$as_me:6458: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -5755,167 +6399,99 @@
+@@ -5755,167 +6467,99 @@
  
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -        echo "$as_me:5758: result: $cf_result" >&5
-+        echo "$as_me:6402: result: $cf_result" >&5
++        echo "$as_me:6470: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
      fi
@@ -46794 +65644 @@
 +    # 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:6420: checking for $ac_word" >&5
++echo "$as_me:6488: 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
@@ -46809 +65659 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:6435: found $ac_dir/$ac_word" >&5
++echo "$as_me:6503: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -46849 +65699 @@
 +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:6443: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:6511: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
  else
@@ -46855 +65705 @@
 -cat conftest.$ac_ext >&5
 -cf_cv_netbsd_menu_h=no
-+  echo "$as_me:6446: result: no" >&5
++  echo "$as_me:6514: result: no" >&5
 +echo "${ECHO_T}no" >&6
  fi
@@ -46884 +65734 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:5881: checking for $ac_word" >&5
-+echo "$as_me:6459: checking for $ac_word" >&5
++echo "$as_me:6527: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
@@ -46910 +65760 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:6474: found $ac_dir/$ac_word" >&5
++echo "$as_me:6542: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -46925 +65775 @@
 +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 +if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  echo "$as_me:6482: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:6550: result: $ac_ct_NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
 -  echo "$as_me:5912: result: no" >&5
-+  echo "$as_me:6485: result: no" >&5
++  echo "$as_me:6553: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -46944 +65794 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -5924,7 +6500,7 @@
+@@ -5924,7 +6568,7 @@
  
  # even with config script, some packages use no-override for curses.h
  
 -echo "$as_me:5927: checking if we have identified curses headers" >&5
-+echo "$as_me:6503: checking if we have identified curses headers" >&5
++echo "$as_me:6571: 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
-@@ -5932,13 +6508,13 @@
+@@ -5932,13 +6576,13 @@
  
  cf_cv_ncurses_header=none
@@ -46968 +65818 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5941 "configure"
-+#line 6517 "configure"
++#line 6585 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -5950,16 +6526,16 @@
+@@ -5950,16 +6594,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5953: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6597: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5956: \$? = $ac_status" >&5
-+  echo "$as_me:6532: \$? = $ac_status" >&5
++  echo "$as_me:6600: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5959: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6603: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5962: \$? = $ac_status" >&5
-+  echo "$as_me:6538: \$? = $ac_status" >&5
++  echo "$as_me:6606: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -5970,11 +6546,11 @@
+@@ -5970,11 +6614,11 @@
  done
  
  fi
 -echo "$as_me:5973: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6549: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6617: result: $cf_cv_ncurses_header" >&5
  echo "${ECHO_T}$cf_cv_ncurses_header" >&6
  
  if test "$cf_cv_ncurses_header" = none ; then
 -       { { echo "$as_me:5977: error: No curses header-files found" >&5
-+       { { echo "$as_me:6553: error: No curses header-files found" >&5
++       { { echo "$as_me:6621: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5984,23 +6560,23 @@
+@@ -5984,23 +6628,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:5987: checking for $ac_header" >&5
-+echo "$as_me:6563: checking for $ac_header" >&5
++echo "$as_me:6631: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -47019 +65869 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5993 "configure"
-+#line 6569 "configure"
++#line 6637 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:5997: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6573: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6641: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -47031 +65881 @@
    cat conftest.err >&5
 -  echo "$as_me:6003: \$? = $ac_status" >&5
-+  echo "$as_me:6579: \$? = $ac_status" >&5
++  echo "$as_me:6647: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6019,7 +6595,7 @@
+@@ -6019,7 +6663,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:6022: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6598: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6666: 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
-@@ -6072,7 +6648,7 @@
+@@ -6072,7 +6716,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6075 "configure"
-+#line 6651 "configure"
++#line 6719 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6084,16 +6660,16 @@
+@@ -6084,16 +6728,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6087: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6731: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6090: \$? = $ac_status" >&5
-+  echo "$as_me:6666: \$? = $ac_status" >&5
++  echo "$as_me:6734: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6737: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6096: \$? = $ac_status" >&5
-+  echo "$as_me:6672: \$? = $ac_status" >&5
++  echo "$as_me:6740: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6110,7 +6686,7 @@
+@@ -6110,7 +6754,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6113: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6689: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6757: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6127,7 +6703,7 @@
+@@ -6127,7 +6771,7 @@
  
  }
  
 -echo "$as_me:6130: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6706: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:6774: 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
-@@ -6139,7 +6715,7 @@
+@@ -6139,7 +6783,7 @@
         do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 6142 "configure"
-+#line 6718 "configure"
++#line 6786 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -6163,16 +6739,16 @@
+@@ -6163,16 +6807,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6166: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6742: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6169: \$? = $ac_status" >&5
-+  echo "$as_me:6745: \$? = $ac_status" >&5
++  echo "$as_me:6813: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6172: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6175: \$? = $ac_status" >&5
-+  echo "$as_me:6751: \$? = $ac_status" >&5
++  echo "$as_me:6819: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -6187,14 +6763,14 @@
+@@ -6187,14 +6831,14 @@
         done
  
  fi
 -echo "$as_me:6190: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6766: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6834: result: $cf_cv_ncurses_h" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h" >&6
  
@@ -47135 +65985 @@
  
 -echo "$as_me:6197: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6773: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6841: 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
-@@ -6334,7 +6910,7 @@
+@@ -6334,7 +6978,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6337 "configure"
-+#line 6913 "configure"
++#line 6981 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6346,16 +6922,16 @@
+@@ -6346,16 +6990,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6349: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6993: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6352: \$? = $ac_status" >&5
-+  echo "$as_me:6928: \$? = $ac_status" >&5
++  echo "$as_me:6996: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6355: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6999: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6358: \$? = $ac_status" >&5
-+  echo "$as_me:6934: \$? = $ac_status" >&5
++  echo "$as_me:7002: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6372,7 +6948,7 @@
+@@ -6372,7 +7016,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6375: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6951: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7019: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6393,7 +6969,7 @@
+@@ -6393,7 +7037,7 @@
                 do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 6396 "configure"
-+#line 6972 "configure"
++#line 7040 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -6417,16 +6993,16 @@
+@@ -6417,16 +7061,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6420: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7064: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6423: \$? = $ac_status" >&5
-+  echo "$as_me:6999: \$? = $ac_status" >&5
++  echo "$as_me:7067: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7070: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6429: \$? = $ac_status" >&5
-+  echo "$as_me:7005: \$? = $ac_status" >&5
++  echo "$as_me:7073: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -6447,12 +7023,12 @@
+@@ -6447,12 +7091,12 @@
                 CPPFLAGS="$cf_save2_CPPFLAGS"
                 test "$cf_cv_ncurses_h2" != no && break
         done
 -       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6450: error: not found" >&5
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7026: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7094: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
@@ -47219 +66069 @@
  fi
 -echo "$as_me:6455: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:7031: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:7099: result: $cf_cv_ncurses_h2" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
  
         cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -6485,7 +7061,7 @@
+@@ -6485,7 +7129,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6488 "configure"
-+#line 7064 "configure"
++#line 7132 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6497,16 +7073,16 @@
+@@ -6497,16 +7141,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6500: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7144: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6503: \$? = $ac_status" >&5
-+  echo "$as_me:7079: \$? = $ac_status" >&5
++  echo "$as_me:7147: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7150: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6509: \$? = $ac_status" >&5
-+  echo "$as_me:7085: \$? = $ac_status" >&5
++  echo "$as_me:7153: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6523,7 +7099,7 @@
+@@ -6523,7 +7167,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6526: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7102: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7170: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6566,7 +7142,7 @@
+@@ -6566,7 +7210,7 @@
         ;;
  esac
  
 -echo "$as_me:6569: checking for terminfo header" >&5
-+echo "$as_me:7145: checking for terminfo header" >&5
++echo "$as_me:7213: 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
-@@ -6584,7 +7160,7 @@
+@@ -6584,7 +7228,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6587 "configure"
-+#line 7163 "configure"
++#line 7231 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6599,16 +7175,16 @@
+@@ -6599,16 +7243,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6602: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7246: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6605: \$? = $ac_status" >&5
-+  echo "$as_me:7181: \$? = $ac_status" >&5
++  echo "$as_me:7249: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6608: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7252: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6611: \$? = $ac_status" >&5
-+  echo "$as_me:7187: \$? = $ac_status" >&5
++  echo "$as_me:7255: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -6624,7 +7200,7 @@
+@@ -6624,7 +7268,7 @@
  done
  
  fi
 -echo "$as_me:6627: result: $cf_cv_term_header" >&5
-+echo "$as_me:7203: result: $cf_cv_term_header" >&5
++echo "$as_me:7271: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -6658,7 +7234,7 @@
+@@ -6658,7 +7302,7 @@
  #define NCURSES 1
  EOF
  
 -echo "$as_me:6661: checking for ncurses version" >&5
-+echo "$as_me:7237: checking for ncurses version" >&5
++echo "$as_me:7305: 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
-@@ -6684,10 +7260,10 @@
+@@ -6684,10 +7328,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:6687: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:7263: \"$cf_try\"") >&5
++       { (eval echo "$as_me:7331: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6690: \$? = $ac_status" >&5
-+  echo "$as_me:7266: \$? = $ac_status" >&5
++  echo "$as_me:7334: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -6697,7 +7273,7 @@
+@@ -6697,7 +7341,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6700 "configure"
-+#line 7276 "configure"
++#line 7344 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6722,15 +7298,15 @@
+@@ -6722,15 +7366,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6725: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7369: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6728: \$? = $ac_status" >&5
-+  echo "$as_me:7304: \$? = $ac_status" >&5
++  echo "$as_me:7372: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6730: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7374: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6733: \$? = $ac_status" >&5
-+  echo "$as_me:7309: \$? = $ac_status" >&5
++  echo "$as_me:7377: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6744,7 +7320,7 @@
+@@ -6744,7 +7388,7 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:6747: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:7323: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7391: 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
-@@ -6756,7 +7332,7 @@
+@@ -6756,7 +7400,7 @@
         # to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
 -echo "$as_me:6759: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:7335: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:7403: 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
-@@ -6764,7 +7340,7 @@
+@@ -6764,7 +7408,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6767 "configure"
-+#line 7343 "configure"
++#line 7411 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6783,16 +7359,16 @@
+@@ -6783,16 +7427,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6786: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7430: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6789: \$? = $ac_status" >&5
-+  echo "$as_me:7365: \$? = $ac_status" >&5
++  echo "$as_me:7433: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6792: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7436: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6795: \$? = $ac_status" >&5
-+  echo "$as_me:7371: \$? = $ac_status" >&5
++  echo "$as_me:7439: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -6803,10 +7379,10 @@
+@@ -6803,10 +7447,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6806: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:7382: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7450: result: $ac_cv_lib_gpm_Gpm_Open" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
  if test $ac_cv_lib_gpm_Gpm_Open = yes; then
 -  echo "$as_me:6809: checking for initscr in -lgpm" >&5
-+  echo "$as_me:7385: checking for initscr in -lgpm" >&5
++  echo "$as_me:7453: 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
-@@ -6814,7 +7390,7 @@
+@@ -6814,7 +7458,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6817 "configure"
-+#line 7393 "configure"
++#line 7461 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6833,16 +7409,16 @@
+@@ -6833,16 +7477,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6836: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7480: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6839: \$? = $ac_status" >&5
-+  echo "$as_me:7415: \$? = $ac_status" >&5
++  echo "$as_me:7483: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6842: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6845: \$? = $ac_status" >&5
-+  echo "$as_me:7421: \$? = $ac_status" >&5
++  echo "$as_me:7489: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -6853,7 +7429,7 @@
+@@ -6853,7 +7497,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6856: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:7432: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:7500: result: $ac_cv_lib_gpm_initscr" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
  if test $ac_cv_lib_gpm_initscr = yes; then
    LIBS="$cf_ncurses_SAVE"
-@@ -6868,7 +7444,7 @@
+@@ -6868,7 +7512,7 @@
         # 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:6871: checking for tgoto in -lmytinfo" >&5
-+               echo "$as_me:7447: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:7515: 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
-@@ -6876,7 +7452,7 @@
+@@ -6876,7 +7520,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6879 "configure"
-+#line 7455 "configure"
++#line 7523 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6895,16 +7471,16 @@
+@@ -6895,16 +7539,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6898: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7474: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7542: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6901: \$? = $ac_status" >&5
-+  echo "$as_me:7477: \$? = $ac_status" >&5
++  echo "$as_me:7545: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6904: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7480: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7548: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6907: \$? = $ac_status" >&5
-+  echo "$as_me:7483: \$? = $ac_status" >&5
++  echo "$as_me:7551: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -6915,7 +7491,7 @@
+@@ -6915,7 +7559,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6918: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7494: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7562: result: $ac_cv_lib_mytinfo_tgoto" >&5
  echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
  if test $ac_cv_lib_mytinfo_tgoto = yes; then
    cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -6934,13 +7510,13 @@
+@@ -6934,13 +7578,13 @@
  
         eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
         cf_libdir=""
 -       echo "$as_me:6937: checking for initscr" >&5
-+       echo "$as_me:7513: checking for initscr" >&5
++       echo "$as_me:7581: checking for initscr" >&5
  echo $ECHO_N "checking for initscr... $ECHO_C" >&6
  if test "${ac_cv_func_initscr+set}" = set; then
@@ -47521 +66371 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6943 "configure"
-+#line 7519 "configure"
++#line 7587 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -6971,16 +7547,16 @@
+@@ -6963,7 +7607,7 @@
+ #if defined (__stub_initscr) || defined (__stub___initscr)
+ choke me
+ #else
+-f = initscr;
++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6971,16 +7615,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6974: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7618: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6977: \$? = $ac_status" >&5
-+  echo "$as_me:7553: \$? = $ac_status" >&5
++  echo "$as_me:7621: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7624: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6983: \$? = $ac_status" >&5
-+  echo "$as_me:7559: \$? = $ac_status" >&5
++  echo "$as_me:7627: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -6990,18 +7566,18 @@
+@@ -6990,18 +7634,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6993: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7569: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7637: result: $ac_cv_func_initscr" >&5
  echo "${ECHO_T}$ac_cv_func_initscr" >&6
  if test $ac_cv_func_initscr = yes; then
@@ -47559 +66418 @@
                 cf_save_LIBS="$LIBS"
 -               echo "$as_me:7000: checking for initscr in -l$cf_nculib_root" >&5
-+               echo "$as_me:7576: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:7644: checking for initscr in -l$cf_nculib_root" >&5
  echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                 LIBS="-l$cf_nculib_root $LIBS"
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7004 "configure"
-+#line 7580 "configure"
++#line 7648 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7013,25 +7589,25 @@
+@@ -7013,25 +7657,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7016: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7660: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7019: \$? = $ac_status" >&5
-+  echo "$as_me:7595: \$? = $ac_status" >&5
++  echo "$as_me:7663: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7022: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7666: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7025: \$? = $ac_status" >&5
-+  echo "$as_me:7601: \$? = $ac_status" >&5
++  echo "$as_me:7669: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7027: result: yes" >&5
-+  echo "$as_me:7603: result: yes" >&5
++  echo "$as_me:7671: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -47596 +66455 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7034: result: no" >&5
-+echo "$as_me:7610: result: no" >&5
++echo "$as_me:7678: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -7121,11 +7697,11 @@
+@@ -7121,11 +7765,11 @@
  
                         for cf_libdir in $cf_search
                         do
 -                               echo "$as_me:7124: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+                               echo "$as_me:7700: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:7768: checking for -l$cf_nculib_root in $cf_libdir" >&5
  echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7128 "configure"
-+#line 7704 "configure"
++#line 7772 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7137,25 +7713,25 @@
+@@ -7137,25 +7781,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7140: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7716: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7784: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7143: \$? = $ac_status" >&5
-+  echo "$as_me:7719: \$? = $ac_status" >&5
++  echo "$as_me:7787: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7790: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7149: \$? = $ac_status" >&5
-+  echo "$as_me:7725: \$? = $ac_status" >&5
++  echo "$as_me:7793: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7151: result: yes" >&5
-+  echo "$as_me:7727: result: yes" >&5
++  echo "$as_me:7795: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -47642 +66501 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7158: result: no" >&5
-+echo "$as_me:7734: result: no" >&5
++echo "$as_me:7802: result: no" >&5
  echo "${ECHO_T}no" >&6
                                          LIBS="$cf_save_LIBS"
  fi
-@@ -7170,7 +7746,7 @@
+@@ -7170,7 +7814,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
 -       { { echo "$as_me:7173: error: Cannot link $cf_nculib_root library" >&5
-+       { { echo "$as_me:7749: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:7817: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -7178,7 +7754,7 @@
+@@ -7178,7 +7822,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
 -       echo "$as_me:7181: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+       echo "$as_me:7757: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:7825: 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
-@@ -7188,7 +7764,7 @@
+@@ -7188,7 +7832,7 @@
                 fi
         done
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7191 "configure"
-+#line 7767 "configure"
++#line 7835 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7200,23 +7776,23 @@
+@@ -7200,23 +7844,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7203: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7779: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7847: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7206: \$? = $ac_status" >&5
-+  echo "$as_me:7782: \$? = $ac_status" >&5
++  echo "$as_me:7850: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7209: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7853: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7212: \$? = $ac_status" >&5
-+  echo "$as_me:7788: \$? = $ac_status" >&5
++  echo "$as_me:7856: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7214: result: yes" >&5
-+  echo "$as_me:7790: result: yes" >&5
++  echo "$as_me:7858: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
@@ -47699 +66558 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7219: result: no" >&5
-+echo "$as_me:7795: result: no" >&5
++echo "$as_me:7863: result: no" >&5
  echo "${ECHO_T}no" >&6
                  LIBS="$cf_ncurses_SAVE"
  fi
-@@ -7232,10 +7808,9 @@
+@@ -7232,10 +7876,9 @@
  fi
  
@@ -47712 +66571 @@
  
 -echo "$as_me:7238: checking for multibyte character support" >&5
-+echo "$as_me:7813: checking for multibyte character support" >&5
++echo "$as_me:7881: 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
-@@ -7243,7 +7818,7 @@
+@@ -7243,7 +7886,7 @@
  
         cf_save_LIBS="$LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7246 "configure"
-+#line 7821 "configure"
++#line 7889 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -7256,16 +7831,16 @@
+@@ -7256,16 +7899,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7259: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7834: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7902: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7262: \$? = $ac_status" >&5
-+  echo "$as_me:7837: \$? = $ac_status" >&5
++  echo "$as_me:7905: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7265: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7268: \$? = $ac_status" >&5
-+  echo "$as_me:7843: \$? = $ac_status" >&5
++  echo "$as_me:7911: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -7277,12 +7852,12 @@
+@@ -7277,12 +7920,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
 -echo "${as_me:-configure}:7280: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:7855: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7923: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
@@ -47757 +66616 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7285 "configure"
-+#line 7860 "configure"
++#line 7928 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -7295,16 +7870,16 @@
+@@ -7295,16 +7938,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7298: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7941: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7301: \$? = $ac_status" >&5
-+  echo "$as_me:7876: \$? = $ac_status" >&5
++  echo "$as_me:7944: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7304: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7947: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7307: \$? = $ac_status" >&5
-+  echo "$as_me:7882: \$? = $ac_status" >&5
++  echo "$as_me:7950: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -7318,7 +7893,7 @@
+@@ -7318,7 +7961,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7321 "configure"
-+#line 7896 "configure"
++#line 7964 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -7331,16 +7906,16 @@
+@@ -7331,16 +7974,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7334: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7977: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7337: \$? = $ac_status" >&5
-+  echo "$as_me:7912: \$? = $ac_status" >&5
++  echo "$as_me:7980: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7340: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7983: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7343: \$? = $ac_status" >&5
-+  echo "$as_me:7918: \$? = $ac_status" >&5
++  echo "$as_me:7986: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -7357,9 +7932,9 @@
+@@ -7357,9 +8000,9 @@
  
      test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
  
 -echo "${as_me:-configure}:7360: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:7935: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8003: testing find linkage for utf8 library ..." 1>&5
  
 -echo "${as_me:-configure}:7362: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:7937: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8005: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
      cf_save_CPPFLAGS="$CPPFLAGS"
      cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -7472,11 +8047,11 @@
+@@ -7472,11 +8115,11 @@
        if test -d $cf_cv_header_path_utf8 ; then
          test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:7475: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:8050: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8118: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
  
          CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 7479 "configure"
-+#line 8054 "configure"
++#line 8122 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -7489,21 +8064,21 @@
+@@ -7489,21 +8132,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7492: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8135: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7495: \$? = $ac_status" >&5
-+  echo "$as_me:8070: \$? = $ac_status" >&5
++  echo "$as_me:8138: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8141: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7501: \$? = $ac_status" >&5
-+  echo "$as_me:8076: \$? = $ac_status" >&5
++  echo "$as_me:8144: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -47861 +66720 @@
  
 -echo "${as_me:-configure}:7506: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:8081: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8149: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
              cf_cv_find_linkage_utf8=maybe
              cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -7521,7 +8096,7 @@
+@@ -7521,7 +8164,7 @@
  
      if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
 -echo "${as_me:-configure}:7524: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:8099: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8167: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
        cf_save_LIBS="$LIBS"
        cf_save_LDFLAGS="$LDFLAGS"
-@@ -7618,13 +8193,13 @@
+@@ -7618,13 +8261,13 @@
            if test -d $cf_cv_library_path_utf8 ; then
              test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:7621: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:8196: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8264: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
  
              CPPFLAGS="$cf_test_CPPFLAGS"
@@ -47886 +66745 @@
              cat >conftest.$ac_ext <<_ACEOF
 -#line 7627 "configure"
-+#line 8202 "configure"
++#line 8270 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -7637,21 +8212,21 @@
+@@ -7637,21 +8280,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7640: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8215: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8283: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7643: \$? = $ac_status" >&5
-+  echo "$as_me:8218: \$? = $ac_status" >&5
++  echo "$as_me:8286: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7646: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8289: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7649: \$? = $ac_status" >&5
-+  echo "$as_me:8224: \$? = $ac_status" >&5
++  echo "$as_me:8292: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -47913 +66772 @@
  
 -echo "${as_me:-configure}:7654: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:8229: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8297: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
                  cf_cv_find_linkage_utf8=yes
                  cf_cv_library_file_utf8="-lutf8"
-@@ -7693,7 +8268,7 @@
+@@ -7693,7 +8336,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:7696: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:8271: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8339: 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
-@@ -7727,7 +8302,7 @@
+@@ -7727,7 +8370,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 7730 "configure"
-+#line 8305 "configure"
++#line 8373 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -7739,16 +8314,16 @@
+@@ -7739,16 +8382,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7742: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8317: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8385: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7745: \$? = $ac_status" >&5
-+  echo "$as_me:8320: \$? = $ac_status" >&5
++  echo "$as_me:8388: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8391: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7751: \$? = $ac_status" >&5
-+  echo "$as_me:8326: \$? = $ac_status" >&5
++  echo "$as_me:8394: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -7765,7 +8340,7 @@
+@@ -7765,7 +8408,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:7768: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8343: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8411: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -7799,7 +8374,7 @@
+@@ -7799,7 +8442,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:7802: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:8377: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8445: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -7813,48 +8388,87 @@
+@@ -7813,48 +8456,87 @@
  cf_ncuconfig_root=ncursesw
  
@@ -47985 +66844 @@
 +    # 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:8397: checking for $ac_word" >&5
++echo "$as_me:8465: 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
@@ -48000 +66859 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:8412: found $ac_dir/$ac_word" >&5
++echo "$as_me:8480: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -48008 +66867 @@
 +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:8420: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8488: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:8423: result: no" >&5
++  echo "$as_me:8491: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -48025 +66884 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:7820: checking for $ac_word" >&5
-+echo "$as_me:8436: checking for $ac_word" >&5
++echo "$as_me:8504: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
@@ -48051 +66910 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:8451: found $ac_dir/$ac_word" >&5
++echo "$as_me:8519: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -48066 +66925 @@
 +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 +if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  echo "$as_me:8459: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8527: result: $ac_ct_NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
 -  echo "$as_me:7851: result: no" >&5
-+  echo "$as_me:8462: result: no" >&5
++  echo "$as_me:8530: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -48085 +66944 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -7863,7 +8477,7 @@
+@@ -7863,7 +8545,7 @@
  
  # even with config script, some packages use no-override for curses.h
  
 -echo "$as_me:7866: checking if we have identified curses headers" >&5
-+echo "$as_me:8480: checking if we have identified curses headers" >&5
++echo "$as_me:8548: 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
-@@ -7871,13 +8485,13 @@
+@@ -7871,13 +8553,13 @@
  
  cf_cv_ncurses_header=none
@@ -48109 +66968 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7880 "configure"
-+#line 8494 "configure"
++#line 8562 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -7889,16 +8503,16 @@
+@@ -7889,16 +8571,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7892: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8574: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7895: \$? = $ac_status" >&5
-+  echo "$as_me:8509: \$? = $ac_status" >&5
++  echo "$as_me:8577: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7898: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8580: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7901: \$? = $ac_status" >&5
-+  echo "$as_me:8515: \$? = $ac_status" >&5
++  echo "$as_me:8583: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -7909,11 +8523,11 @@
+@@ -7909,11 +8591,11 @@
  done
  
  fi
 -echo "$as_me:7912: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:8526: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8594: result: $cf_cv_ncurses_header" >&5
  echo "${ECHO_T}$cf_cv_ncurses_header" >&6
  
  if test "$cf_cv_ncurses_header" = none ; then
 -       { { echo "$as_me:7916: error: No curses header-files found" >&5
-+       { { echo "$as_me:8530: error: No curses header-files found" >&5
++       { { echo "$as_me:8598: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -7923,23 +8537,23 @@
+@@ -7923,23 +8605,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:7926: checking for $ac_header" >&5
-+echo "$as_me:8540: checking for $ac_header" >&5
++echo "$as_me:8608: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -48160 +67019 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 7932 "configure"
-+#line 8546 "configure"
++#line 8614 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:7936: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:8550: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8618: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -48172 +67031 @@
    cat conftest.err >&5
 -  echo "$as_me:7942: \$? = $ac_status" >&5
-+  echo "$as_me:8556: \$? = $ac_status" >&5
++  echo "$as_me:8624: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7958,7 +8572,7 @@
+@@ -7958,7 +8640,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:7961: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:8575: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8643: 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
-@@ -8011,7 +8625,7 @@
+@@ -8011,7 +8693,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 8014 "configure"
-+#line 8628 "configure"
++#line 8696 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8023,16 +8637,16 @@
+@@ -8023,16 +8705,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8026: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8708: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8029: \$? = $ac_status" >&5
-+  echo "$as_me:8643: \$? = $ac_status" >&5
++  echo "$as_me:8711: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8032: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8035: \$? = $ac_status" >&5
-+  echo "$as_me:8649: \$? = $ac_status" >&5
++  echo "$as_me:8717: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8049,7 +8663,7 @@
+@@ -8049,7 +8731,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:8052: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8666: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8734: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8066,7 +8680,7 @@
+@@ -8066,7 +8748,7 @@
  
  }
  
 -echo "$as_me:8069: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:8683: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8751: 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
-@@ -8078,7 +8692,7 @@
+@@ -8078,7 +8760,7 @@
         do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 8081 "configure"
-+#line 8695 "configure"
++#line 8763 "configure"
  #include "confdefs.h"
  
  #define _XOPEN_SOURCE_EXTENDED
-@@ -8110,16 +8724,16 @@
+@@ -8110,16 +8792,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8113: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8795: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8116: \$? = $ac_status" >&5
-+  echo "$as_me:8730: \$? = $ac_status" >&5
++  echo "$as_me:8798: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8119: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8801: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8122: \$? = $ac_status" >&5
-+  echo "$as_me:8736: \$? = $ac_status" >&5
++  echo "$as_me:8804: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -8134,14 +8748,14 @@
+@@ -8134,14 +8816,14 @@
         done
  
  fi
 -echo "$as_me:8137: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:8751: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8819: result: $cf_cv_ncurses_h" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h" >&6
  
@@ -48276 +67135 @@
  
 -echo "$as_me:8144: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:8758: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8826: 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
-@@ -8281,7 +8895,7 @@
+@@ -8281,7 +8963,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 8284 "configure"
-+#line 8898 "configure"
++#line 8966 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8293,16 +8907,16 @@
+@@ -8293,16 +8975,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8296: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8910: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8978: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8299: \$? = $ac_status" >&5
-+  echo "$as_me:8913: \$? = $ac_status" >&5
++  echo "$as_me:8981: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8302: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8984: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8305: \$? = $ac_status" >&5
-+  echo "$as_me:8919: \$? = $ac_status" >&5
++  echo "$as_me:8987: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8319,7 +8933,7 @@
+@@ -8319,7 +9001,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:8322: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8936: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9004: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8340,7 +8954,7 @@
+@@ -8340,7 +9022,7 @@
                 do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 8343 "configure"
-+#line 8957 "configure"
++#line 9025 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -8364,16 +8978,16 @@
+@@ -8364,16 +9046,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8367: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9049: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8370: \$? = $ac_status" >&5
-+  echo "$as_me:8984: \$? = $ac_status" >&5
++  echo "$as_me:9052: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8373: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9055: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8376: \$? = $ac_status" >&5
-+  echo "$as_me:8990: \$? = $ac_status" >&5
++  echo "$as_me:9058: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -8394,12 +9008,12 @@
+@@ -8394,12 +9076,12 @@
                 CPPFLAGS="$cf_save2_CPPFLAGS"
                 test "$cf_cv_ncurses_h2" != no && break
         done
 -       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8397: error: not found" >&5
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9011: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9079: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
@@ -48360 +67219 @@
  fi
 -echo "$as_me:8402: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:9016: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9084: result: $cf_cv_ncurses_h2" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
  
         cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -8432,7 +9046,7 @@
+@@ -8432,7 +9114,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 8435 "configure"
-+#line 9049 "configure"
++#line 9117 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8444,16 +9058,16 @@
+@@ -8444,16 +9126,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8447: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9061: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9129: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8450: \$? = $ac_status" >&5
-+  echo "$as_me:9064: \$? = $ac_status" >&5
++  echo "$as_me:9132: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8453: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9135: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8456: \$? = $ac_status" >&5
-+  echo "$as_me:9070: \$? = $ac_status" >&5
++  echo "$as_me:9138: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8470,7 +9084,7 @@
+@@ -8470,7 +9152,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:8473: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9087: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9155: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8513,7 +9127,7 @@
+@@ -8513,7 +9195,7 @@
         ;;
  esac
  
 -echo "$as_me:8516: checking for terminfo header" >&5
-+echo "$as_me:9130: checking for terminfo header" >&5
++echo "$as_me:9198: 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
-@@ -8531,7 +9145,7 @@
+@@ -8531,7 +9213,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8534 "configure"
-+#line 9148 "configure"
++#line 9216 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8546,16 +9160,16 @@
+@@ -8546,16 +9228,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9163: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9231: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8552: \$? = $ac_status" >&5
-+  echo "$as_me:9166: \$? = $ac_status" >&5
++  echo "$as_me:9234: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8555: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9237: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8558: \$? = $ac_status" >&5
-+  echo "$as_me:9172: \$? = $ac_status" >&5
++  echo "$as_me:9240: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -8571,7 +9185,7 @@
+@@ -8571,7 +9253,7 @@
  done
  
  fi
 -echo "$as_me:8574: result: $cf_cv_term_header" >&5
-+echo "$as_me:9188: result: $cf_cv_term_header" >&5
++echo "$as_me:9256: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -8605,7 +9219,7 @@
+@@ -8605,7 +9287,7 @@
  #define NCURSES 1
  EOF
  
 -echo "$as_me:8608: checking for ncurses version" >&5
-+echo "$as_me:9222: checking for ncurses version" >&5
++echo "$as_me:9290: 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
-@@ -8631,10 +9245,10 @@
+@@ -8631,10 +9313,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:8634: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:9248: \"$cf_try\"") >&5
++       { (eval echo "$as_me:9316: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8637: \$? = $ac_status" >&5
-+  echo "$as_me:9251: \$? = $ac_status" >&5
++  echo "$as_me:9319: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -8644,7 +9258,7 @@
+@@ -8644,7 +9326,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8647 "configure"
-+#line 9261 "configure"
++#line 9329 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8669,15 +9283,15 @@
+@@ -8669,15 +9351,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:8672: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9354: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8675: \$? = $ac_status" >&5
-+  echo "$as_me:9289: \$? = $ac_status" >&5
++  echo "$as_me:9357: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:8677: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9291: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9359: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8680: \$? = $ac_status" >&5
-+  echo "$as_me:9294: \$? = $ac_status" >&5
++  echo "$as_me:9362: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8691,7 +9305,7 @@
+@@ -8691,7 +9373,7 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:8694: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:9308: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9376: 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
-@@ -8703,7 +9317,7 @@
+@@ -8703,7 +9385,7 @@
         # to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
 -echo "$as_me:8706: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:9320: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9388: 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
-@@ -8711,7 +9325,7 @@
+@@ -8711,7 +9393,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8714 "configure"
-+#line 9328 "configure"
++#line 9396 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8730,16 +9344,16 @@
+@@ -8730,16 +9412,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8733: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9347: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9415: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8736: \$? = $ac_status" >&5
-+  echo "$as_me:9350: \$? = $ac_status" >&5
++  echo "$as_me:9418: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8739: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9421: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8742: \$? = $ac_status" >&5
-+  echo "$as_me:9356: \$? = $ac_status" >&5
++  echo "$as_me:9424: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -8750,10 +9364,10 @@
+@@ -8750,10 +9432,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:8753: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:9367: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9435: result: $ac_cv_lib_gpm_Gpm_Open" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
  if test $ac_cv_lib_gpm_Gpm_Open = yes; then
 -  echo "$as_me:8756: checking for initscr in -lgpm" >&5
-+  echo "$as_me:9370: checking for initscr in -lgpm" >&5
++  echo "$as_me:9438: 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
-@@ -8761,7 +9375,7 @@
+@@ -8761,7 +9443,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8764 "configure"
-+#line 9378 "configure"
++#line 9446 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8780,16 +9394,16 @@
+@@ -8780,16 +9462,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8783: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9397: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9465: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8786: \$? = $ac_status" >&5
-+  echo "$as_me:9400: \$? = $ac_status" >&5
++  echo "$as_me:9468: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8789: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9403: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9471: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8792: \$? = $ac_status" >&5
-+  echo "$as_me:9406: \$? = $ac_status" >&5
++  echo "$as_me:9474: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -8800,7 +9414,7 @@
+@@ -8800,7 +9482,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:8803: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:9417: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9485: result: $ac_cv_lib_gpm_initscr" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
  if test $ac_cv_lib_gpm_initscr = yes; then
    LIBS="$cf_ncurses_SAVE"
-@@ -8815,7 +9429,7 @@
+@@ -8815,7 +9497,7 @@
         # 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:8818: checking for tgoto in -lmytinfo" >&5
-+               echo "$as_me:9432: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:9500: 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
-@@ -8823,7 +9437,7 @@
+@@ -8823,7 +9505,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8826 "configure"
-+#line 9440 "configure"
++#line 9508 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8842,16 +9456,16 @@
+@@ -8842,16 +9524,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8845: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9527: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8848: \$? = $ac_status" >&5
-+  echo "$as_me:9462: \$? = $ac_status" >&5
++  echo "$as_me:9530: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8851: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8854: \$? = $ac_status" >&5
-+  echo "$as_me:9468: \$? = $ac_status" >&5
++  echo "$as_me:9536: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -8862,7 +9476,7 @@
+@@ -8862,7 +9544,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:8865: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:9479: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9547: result: $ac_cv_lib_mytinfo_tgoto" >&5
  echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
  if test $ac_cv_lib_mytinfo_tgoto = yes; then
    cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -8881,13 +9495,13 @@
+@@ -8881,13 +9563,13 @@
  
         eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
         cf_libdir=""
 -       echo "$as_me:8884: checking for initscr" >&5
-+       echo "$as_me:9498: checking for initscr" >&5
++       echo "$as_me:9566: checking for initscr" >&5
  echo $ECHO_N "checking for initscr... $ECHO_C" >&6
  if test "${ac_cv_func_initscr+set}" = set; then
@@ -48662 +67521 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8890 "configure"
-+#line 9504 "configure"
++#line 9572 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -8918,16 +9532,16 @@
+@@ -8910,7 +9592,7 @@
+ #if defined (__stub_initscr) || defined (__stub___initscr)
+ choke me
+ #else
+-f = initscr;
++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -8918,16 +9600,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8921: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9535: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9603: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8924: \$? = $ac_status" >&5
-+  echo "$as_me:9538: \$? = $ac_status" >&5
++  echo "$as_me:9606: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8927: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8930: \$? = $ac_status" >&5
-+  echo "$as_me:9544: \$? = $ac_status" >&5
++  echo "$as_me:9612: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -8937,18 +9551,18 @@
+@@ -8937,18 +9619,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:8940: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:9554: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9622: result: $ac_cv_func_initscr" >&5
  echo "${ECHO_T}$ac_cv_func_initscr" >&6
  if test $ac_cv_func_initscr = yes; then
@@ -48700 +67568 @@
                 cf_save_LIBS="$LIBS"
 -               echo "$as_me:8947: checking for initscr in -l$cf_nculib_root" >&5
-+               echo "$as_me:9561: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:9629: checking for initscr in -l$cf_nculib_root" >&5
  echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                 LIBS="-l$cf_nculib_root $LIBS"
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 8951 "configure"
-+#line 9565 "configure"
++#line 9633 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -8960,25 +9574,25 @@
+@@ -8960,25 +9642,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8963: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9645: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8966: \$? = $ac_status" >&5
-+  echo "$as_me:9580: \$? = $ac_status" >&5
++  echo "$as_me:9648: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8969: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9651: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8972: \$? = $ac_status" >&5
-+  echo "$as_me:9586: \$? = $ac_status" >&5
++  echo "$as_me:9654: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:8974: result: yes" >&5
-+  echo "$as_me:9588: result: yes" >&5
++  echo "$as_me:9656: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -48737 +67605 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:8981: result: no" >&5
-+echo "$as_me:9595: result: no" >&5
++echo "$as_me:9663: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -9068,11 +9682,11 @@
+@@ -9068,11 +9750,11 @@
  
                         for cf_libdir in $cf_search
                         do
 -                               echo "$as_me:9071: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+                               echo "$as_me:9685: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:9753: checking for -l$cf_nculib_root in $cf_libdir" >&5
  echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 9075 "configure"
-+#line 9689 "configure"
++#line 9757 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -9084,25 +9698,25 @@
+@@ -9084,25 +9766,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9087: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9701: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9769: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9090: \$? = $ac_status" >&5
-+  echo "$as_me:9704: \$? = $ac_status" >&5
++  echo "$as_me:9772: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9096: \$? = $ac_status" >&5
-+  echo "$as_me:9710: \$? = $ac_status" >&5
++  echo "$as_me:9778: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:9098: result: yes" >&5
-+  echo "$as_me:9712: result: yes" >&5
++  echo "$as_me:9780: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -48783 +67651 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:9105: result: no" >&5
-+echo "$as_me:9719: result: no" >&5
++echo "$as_me:9787: result: no" >&5
  echo "${ECHO_T}no" >&6
                                          LIBS="$cf_save_LIBS"
  fi
-@@ -9117,7 +9731,7 @@
+@@ -9117,7 +9799,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
 -       { { echo "$as_me:9120: error: Cannot link $cf_nculib_root library" >&5
-+       { { echo "$as_me:9734: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:9802: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -9125,7 +9739,7 @@
+@@ -9125,7 +9807,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
 -       echo "$as_me:9128: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+       echo "$as_me:9742: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:9810: 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
-@@ -9135,7 +9749,7 @@
+@@ -9135,7 +9817,7 @@
                 fi
         done
         cat >conftest.$ac_ext <<_ACEOF
 -#line 9138 "configure"
-+#line 9752 "configure"
++#line 9820 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -9147,23 +9761,23 @@
+@@ -9147,23 +9829,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9150: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9832: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9153: \$? = $ac_status" >&5
-+  echo "$as_me:9767: \$? = $ac_status" >&5
++  echo "$as_me:9835: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9156: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9838: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9159: \$? = $ac_status" >&5
-+  echo "$as_me:9773: \$? = $ac_status" >&5
++  echo "$as_me:9841: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:9161: result: yes" >&5
-+  echo "$as_me:9775: result: yes" >&5
++  echo "$as_me:9843: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
@@ -48840 +67708 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:9166: result: no" >&5
-+echo "$as_me:9780: result: no" >&5
++echo "$as_me:9848: result: no" >&5
  echo "${ECHO_T}no" >&6
                  LIBS="$cf_ncurses_SAVE"
  fi
-@@ -9179,9 +9793,9 @@
+@@ -9179,9 +9861,9 @@
  fi
  
@@ -48852 +67720 @@
  
 -echo "$as_me:9184: checking if you want to use pkg-config" >&5
-+echo "$as_me:9798: checking if you want to use pkg-config" >&5
++echo "$as_me:9866: 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.
-@@ -9191,7 +9805,7 @@
+@@ -9191,7 +9873,7 @@
  else
    cf_pkg_config=yes
  fi;
 -echo "$as_me:9194: result: $cf_pkg_config" >&5
-+echo "$as_me:9808: result: $cf_pkg_config" >&5
++echo "$as_me:9876: result: $cf_pkg_config" >&5
  echo "${ECHO_T}$cf_pkg_config" >&6
  
  case $cf_pkg_config in #(vi
-@@ -9199,10 +9813,11 @@
+@@ -9199,10 +9881,11 @@
         PKG_CONFIG=none
         ;;
@@ -48875 +67743 @@
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 -echo "$as_me:9205: checking for $ac_word" >&5
-+echo "$as_me:9820: checking for $ac_word" >&5
++echo "$as_me:9888: 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
-@@ -9219,7 +9834,7 @@
+@@ -9219,7 +9902,7 @@
    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:9222: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:9837: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9905: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -9230,10 +9845,10 @@
+@@ -9230,10 +9913,10 @@
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  
  if test -n "$PKG_CONFIG"; then
 -  echo "$as_me:9233: result: $PKG_CONFIG" >&5
-+  echo "$as_me:9848: result: $PKG_CONFIG" >&5
++  echo "$as_me:9916: result: $PKG_CONFIG" >&5
  echo "${ECHO_T}$PKG_CONFIG" >&6
  else
 -  echo "$as_me:9236: result: no" >&5
-+  echo "$as_me:9851: result: no" >&5
++  echo "$as_me:9919: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -9242,7 +9857,7 @@
+@@ -9242,7 +9925,7 @@
    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:9245: checking for $ac_word" >&5
-+echo "$as_me:9860: checking for $ac_word" >&5
++echo "$as_me:9928: 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
-@@ -9259,7 +9874,7 @@
+@@ -9259,7 +9942,7 @@
    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:9262: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:9877: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9945: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -9271,10 +9886,10 @@
+@@ -9271,10 +9954,10 @@
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  
  if test -n "$ac_pt_PKG_CONFIG"; then
 -  echo "$as_me:9274: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:9889: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:9957: result: $ac_pt_PKG_CONFIG" >&5
  echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
  else
 -  echo "$as_me:9277: result: no" >&5
-+  echo "$as_me:9892: result: no" >&5
++  echo "$as_me:9960: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -9317,7 +9932,7 @@
+@@ -9305,7 +9988,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval PKG_CONFIG="$PKG_CONFIG"
+   case ".$PKG_CONFIG" in #(vi
+   .NONE/*)
+@@ -9317,7 +10000,7 @@
    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:9320: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+  { { echo "$as_me:9935: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:10003: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
  echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -9325,7 +9940,7 @@
+@@ -9325,7 +10008,7 @@
  
  fi
  
 -echo "$as_me:9328: checking for X" >&5
-+echo "$as_me:9943: checking for X" >&5
++echo "$as_me:10011: checking for X" >&5
  echo $ECHO_N "checking for X... $ECHO_C" >&6
  
  # Check whether --with-x or --without-x was given.
-@@ -9422,17 +10037,17 @@
+@@ -9422,17 +10105,17 @@
    # 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 9425 "configure"
-+#line 10040 "configure"
++#line 10108 "configure"
  #include "confdefs.h"
  #include <X11/Intrinsic.h>
  _ACEOF
 -if { (eval echo "$as_me:9429: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10044: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10112: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -48967 +67844 @@
    cat conftest.err >&5
 -  echo "$as_me:9435: \$? = $ac_status" >&5
-+  echo "$as_me:10050: \$? = $ac_status" >&5
++  echo "$as_me:10118: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9465,7 +10080,7 @@
+@@ -9465,7 +10148,7 @@
    ac_save_LIBS=$LIBS
    LIBS="-lXt $LIBS"
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9468 "configure"
-+#line 10083 "configure"
++#line 10151 "configure"
  #include "confdefs.h"
  #include <X11/Intrinsic.h>
  int
-@@ -9477,16 +10092,16 @@
+@@ -9477,16 +10160,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9480: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10095: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9483: \$? = $ac_status" >&5
-+  echo "$as_me:10098: \$? = $ac_status" >&5
++  echo "$as_me:10166: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9486: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10169: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9489: \$? = $ac_status" >&5
-+  echo "$as_me:10104: \$? = $ac_status" >&5
++  echo "$as_me:10172: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
-@@ -9524,7 +10139,7 @@
+@@ -9524,7 +10207,7 @@
  fi # $with_x != no
  
  if test "$have_x" != yes; then
 -  echo "$as_me:9527: result: $have_x" >&5
-+  echo "$as_me:10142: result: $have_x" >&5
++  echo "$as_me:10210: result: $have_x" >&5
  echo "${ECHO_T}$have_x" >&6
    no_x=yes
  else
-@@ -9534,7 +10149,7 @@
+@@ -9534,7 +10217,7 @@
    # 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:9537: result: libraries $x_libraries, headers $x_includes" >&5
-+  echo "$as_me:10152: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:10220: result: libraries $x_libraries, headers $x_includes" >&5
  echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
  fi
  
-@@ -9558,11 +10173,11 @@
+@@ -9558,11 +10241,11 @@
      # others require no space.  Words are not sufficient . . . .
      case `(uname -sr) 2>/dev/null` in
      "SunOS 5"*)
 -      echo "$as_me:9561: checking whether -R must be followed by a space" >&5
-+      echo "$as_me:10176: checking whether -R must be followed by a space" >&5
++      echo "$as_me:10244: checking whether -R must be followed by a space" >&5
  echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
        ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
        cat >conftest.$ac_ext <<_ACEOF
 -#line 9565 "configure"
-+#line 10180 "configure"
++#line 10248 "configure"
  #include "confdefs.h"
  
  int
-@@ -9574,16 +10189,16 @@
+@@ -9574,16 +10257,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9577: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10192: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10260: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9580: \$? = $ac_status" >&5
-+  echo "$as_me:10195: \$? = $ac_status" >&5
++  echo "$as_me:10263: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9583: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10266: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9586: \$? = $ac_status" >&5
-+  echo "$as_me:10201: \$? = $ac_status" >&5
++  echo "$as_me:10269: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_R_nospace=yes
  else
-@@ -9593,13 +10208,13 @@
+@@ -9593,13 +10276,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        if test $ac_R_nospace = yes; then
 -       echo "$as_me:9596: result: no" >&5
-+       echo "$as_me:10211: result: no" >&5
++       echo "$as_me:10279: result: no" >&5
  echo "${ECHO_T}no" >&6
         X_LIBS="$X_LIBS -R$x_libraries"
@@ -49066 +67943 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 9602 "configure"
-+#line 10217 "configure"
++#line 10285 "configure"
  #include "confdefs.h"
  
  int
-@@ -9611,16 +10226,16 @@
+@@ -9611,16 +10294,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9614: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10229: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10297: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9617: \$? = $ac_status" >&5
-+  echo "$as_me:10232: \$? = $ac_status" >&5
++  echo "$as_me:10300: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9620: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10235: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10303: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9623: \$? = $ac_status" >&5
-+  echo "$as_me:10238: \$? = $ac_status" >&5
++  echo "$as_me:10306: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_R_space=yes
  else
-@@ -9630,11 +10245,11 @@
+@@ -9630,11 +10313,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         if test $ac_R_space = yes; then
 -         echo "$as_me:9633: result: yes" >&5
-+         echo "$as_me:10248: result: yes" >&5
++         echo "$as_me:10316: result: yes" >&5
  echo "${ECHO_T}yes" >&6
           X_LIBS="$X_LIBS -R $x_libraries"
         else
 -         echo "$as_me:9637: result: neither works" >&5
-+         echo "$as_me:10252: result: neither works" >&5
++         echo "$as_me:10320: result: neither works" >&5
  echo "${ECHO_T}neither works" >&6
         fi
        fi
-@@ -9654,7 +10269,7 @@
+@@ -9654,7 +10337,7 @@
      # the Alpha needs dnet_stub (dnet does not exist).
      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
      cat >conftest.$ac_ext <<_ACEOF
 -#line 9657 "configure"
-+#line 10272 "configure"
++#line 10340 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9673,22 +10288,22 @@
+@@ -9673,22 +10356,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9676: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10359: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9679: \$? = $ac_status" >&5
-+  echo "$as_me:10294: \$? = $ac_status" >&5
++  echo "$as_me:10362: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9682: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10365: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9685: \$? = $ac_status" >&5
-+  echo "$as_me:10300: \$? = $ac_status" >&5
++  echo "$as_me:10368: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
@@ -49138 +68015 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:9691: checking for dnet_ntoa in -ldnet" >&5
-+echo "$as_me:10306: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:10374: 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
-@@ -9696,7 +10311,7 @@
+@@ -9696,7 +10379,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9699 "configure"
-+#line 10314 "configure"
++#line 10382 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9715,16 +10330,16 @@
+@@ -9715,16 +10398,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9718: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10333: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10401: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9721: \$? = $ac_status" >&5
-+  echo "$as_me:10336: \$? = $ac_status" >&5
++  echo "$as_me:10404: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9727: \$? = $ac_status" >&5
-+  echo "$as_me:10342: \$? = $ac_status" >&5
++  echo "$as_me:10410: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dnet_dnet_ntoa=yes
  else
-@@ -9735,14 +10350,14 @@
+@@ -9735,14 +10418,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:9738: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "$as_me:10353: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:10421: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
  if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
@@ -49185 +68062 @@
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 -      echo "$as_me:9745: checking for dnet_ntoa in -ldnet_stub" >&5
-+      echo "$as_me:10360: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:10428: 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
-@@ -9750,7 +10365,7 @@
+@@ -9750,7 +10433,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9753 "configure"
-+#line 10368 "configure"
++#line 10436 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9769,16 +10384,16 @@
+@@ -9769,16 +10452,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9772: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10455: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9775: \$? = $ac_status" >&5
-+  echo "$as_me:10390: \$? = $ac_status" >&5
++  echo "$as_me:10458: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9778: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10461: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9781: \$? = $ac_status" >&5
-+  echo "$as_me:10396: \$? = $ac_status" >&5
++  echo "$as_me:10464: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dnet_stub_dnet_ntoa=yes
  else
-@@ -9789,7 +10404,7 @@
+@@ -9789,7 +10472,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:9792: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "$as_me:10407: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:10475: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
  if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-@@ -9808,13 +10423,13 @@
+@@ -9808,13 +10491,13 @@
      # 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:9811: checking for gethostbyname" >&5
-+    echo "$as_me:10426: checking for gethostbyname" >&5
++    echo "$as_me:10494: checking for gethostbyname" >&5
  echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
  if test "${ac_cv_func_gethostbyname+set}" = set; then
@@ -49240 +68117 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9817 "configure"
-+#line 10432 "configure"
++#line 10500 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname (); below.  */
-@@ -9845,16 +10460,16 @@
+@@ -9837,7 +10520,7 @@
+ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+ choke me
+ #else
+-f = gethostbyname;
++f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -9845,16 +10528,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9848: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10531: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9851: \$? = $ac_status" >&5
-+  echo "$as_me:10466: \$? = $ac_status" >&5
++  echo "$as_me:10534: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9854: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10537: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9857: \$? = $ac_status" >&5
-+  echo "$as_me:10472: \$? = $ac_status" >&5
++  echo "$as_me:10540: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gethostbyname=yes
  else
-@@ -9864,11 +10479,11 @@
+@@ -9864,11 +10547,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9867: result: $ac_cv_func_gethostbyname" >&5
-+echo "$as_me:10482: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:10550: result: $ac_cv_func_gethostbyname" >&5
  echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
  
      if test $ac_cv_func_gethostbyname = no; then
 -      echo "$as_me:9871: checking for gethostbyname in -lnsl" >&5
-+      echo "$as_me:10486: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:10554: 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
-@@ -9876,7 +10491,7 @@
+@@ -9876,7 +10559,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9879 "configure"
-+#line 10494 "configure"
++#line 10562 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9895,16 +10510,16 @@
+@@ -9895,16 +10578,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9898: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10513: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10581: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9901: \$? = $ac_status" >&5
-+  echo "$as_me:10516: \$? = $ac_status" >&5
++  echo "$as_me:10584: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9904: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10587: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9907: \$? = $ac_status" >&5
-+  echo "$as_me:10522: \$? = $ac_status" >&5
++  echo "$as_me:10590: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_nsl_gethostbyname=yes
  else
-@@ -9915,14 +10530,14 @@
+@@ -9915,14 +10598,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:9918: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "$as_me:10533: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:10601: result: $ac_cv_lib_nsl_gethostbyname" >&5
  echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
  if test $ac_cv_lib_nsl_gethostbyname = yes; then
@@ -49322 +68208 @@
        if test $ac_cv_lib_nsl_gethostbyname = no; then
 -        echo "$as_me:9925: checking for gethostbyname in -lbsd" >&5
-+        echo "$as_me:10540: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:10608: 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
-@@ -9930,7 +10545,7 @@
+@@ -9930,7 +10613,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9933 "configure"
-+#line 10548 "configure"
++#line 10616 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9949,16 +10564,16 @@
+@@ -9949,16 +10632,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9952: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10567: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10635: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9955: \$? = $ac_status" >&5
-+  echo "$as_me:10570: \$? = $ac_status" >&5
++  echo "$as_me:10638: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9958: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10641: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9961: \$? = $ac_status" >&5
-+  echo "$as_me:10576: \$? = $ac_status" >&5
++  echo "$as_me:10644: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gethostbyname=yes
  else
-@@ -9969,7 +10584,7 @@
+@@ -9969,7 +10652,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:9972: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "$as_me:10587: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:10655: result: $ac_cv_lib_bsd_gethostbyname" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
  if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-@@ -9985,13 +10600,13 @@
+@@ -9985,13 +10668,13 @@
      # 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:9988: checking for connect" >&5
-+    echo "$as_me:10603: checking for connect" >&5
++    echo "$as_me:10671: checking for connect" >&5
  echo $ECHO_N "checking for connect... $ECHO_C" >&6
  if test "${ac_cv_func_connect+set}" = set; then
@@ -49377 +68263 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9994 "configure"
-+#line 10609 "configure"
++#line 10677 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect (); below.  */
-@@ -10022,16 +10637,16 @@
+@@ -10014,7 +10697,7 @@
+ #if defined (__stub_connect) || defined (__stub___connect)
+ choke me
+ #else
+-f = connect;
++f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -10022,16 +10705,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10025: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10640: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10708: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10028: \$? = $ac_status" >&5
-+  echo "$as_me:10643: \$? = $ac_status" >&5
++  echo "$as_me:10711: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10714: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10034: \$? = $ac_status" >&5
-+  echo "$as_me:10649: \$? = $ac_status" >&5
++  echo "$as_me:10717: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_connect=yes
  else
-@@ -10041,11 +10656,11 @@
+@@ -10041,11 +10724,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:10044: result: $ac_cv_func_connect" >&5
-+echo "$as_me:10659: result: $ac_cv_func_connect" >&5
++echo "$as_me:10727: result: $ac_cv_func_connect" >&5
  echo "${ECHO_T}$ac_cv_func_connect" >&6
  
      if test $ac_cv_func_connect = no; then
 -      echo "$as_me:10048: checking for connect in -lsocket" >&5
-+      echo "$as_me:10663: checking for connect in -lsocket" >&5
++      echo "$as_me:10731: 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
-@@ -10053,7 +10668,7 @@
+@@ -10053,7 +10736,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10056 "configure"
-+#line 10671 "configure"
++#line 10739 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10072,16 +10687,16 @@
+@@ -10072,16 +10755,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10075: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10758: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10078: \$? = $ac_status" >&5
-+  echo "$as_me:10693: \$? = $ac_status" >&5
++  echo "$as_me:10761: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10764: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10084: \$? = $ac_status" >&5
-+  echo "$as_me:10699: \$? = $ac_status" >&5
++  echo "$as_me:10767: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_socket_connect=yes
  else
-@@ -10092,7 +10707,7 @@
+@@ -10092,7 +10775,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10095: result: $ac_cv_lib_socket_connect" >&5
-+echo "$as_me:10710: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:10778: result: $ac_cv_lib_socket_connect" >&5
  echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
  if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-@@ -10101,13 +10716,13 @@
+@@ -10101,13 +10784,13 @@
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
 -    echo "$as_me:10104: checking for remove" >&5
-+    echo "$as_me:10719: checking for remove" >&5
++    echo "$as_me:10787: checking for remove" >&5
  echo $ECHO_N "checking for remove... $ECHO_C" >&6
  if test "${ac_cv_func_remove+set}" = set; then
@@ -49467 +68362 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10110 "configure"
-+#line 10725 "configure"
++#line 10793 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char remove (); below.  */
-@@ -10138,16 +10753,16 @@
+@@ -10130,7 +10813,7 @@
+ #if defined (__stub_remove) || defined (__stub___remove)
+ choke me
+ #else
+-f = remove;
++f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -10138,16 +10821,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10824: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10144: \$? = $ac_status" >&5
-+  echo "$as_me:10759: \$? = $ac_status" >&5
++  echo "$as_me:10827: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10830: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10150: \$? = $ac_status" >&5
-+  echo "$as_me:10765: \$? = $ac_status" >&5
++  echo "$as_me:10833: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_remove=yes
  else
-@@ -10157,11 +10772,11 @@
+@@ -10157,11 +10840,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:10160: result: $ac_cv_func_remove" >&5
-+echo "$as_me:10775: result: $ac_cv_func_remove" >&5
++echo "$as_me:10843: result: $ac_cv_func_remove" >&5
  echo "${ECHO_T}$ac_cv_func_remove" >&6
  
      if test $ac_cv_func_remove = no; then
 -      echo "$as_me:10164: checking for remove in -lposix" >&5
-+      echo "$as_me:10779: checking for remove in -lposix" >&5
++      echo "$as_me:10847: 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
-@@ -10169,7 +10784,7 @@
+@@ -10169,7 +10852,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10172 "configure"
-+#line 10787 "configure"
++#line 10855 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10188,16 +10803,16 @@
+@@ -10188,16 +10871,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10191: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10806: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10874: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10194: \$? = $ac_status" >&5
-+  echo "$as_me:10809: \$? = $ac_status" >&5
++  echo "$as_me:10877: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10197: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10880: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10200: \$? = $ac_status" >&5
-+  echo "$as_me:10815: \$? = $ac_status" >&5
++  echo "$as_me:10883: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_posix_remove=yes
  else
-@@ -10208,7 +10823,7 @@
+@@ -10208,7 +10891,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10211: result: $ac_cv_lib_posix_remove" >&5
-+echo "$as_me:10826: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:10894: result: $ac_cv_lib_posix_remove" >&5
  echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-@@ -10217,13 +10832,13 @@
+@@ -10217,13 +10900,13 @@
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 -    echo "$as_me:10220: checking for shmat" >&5
-+    echo "$as_me:10835: checking for shmat" >&5
++    echo "$as_me:10903: checking for shmat" >&5
  echo $ECHO_N "checking for shmat... $ECHO_C" >&6
  if test "${ac_cv_func_shmat+set}" = set; then
@@ -49557 +68461 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10226 "configure"
-+#line 10841 "configure"
++#line 10909 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char shmat (); below.  */
-@@ -10254,16 +10869,16 @@
+@@ -10246,7 +10929,7 @@
+ #if defined (__stub_shmat) || defined (__stub___shmat)
+ choke me
+ #else
+-f = shmat;
++f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -10254,16 +10937,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10257: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10940: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10260: \$? = $ac_status" >&5
-+  echo "$as_me:10875: \$? = $ac_status" >&5
++  echo "$as_me:10943: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10263: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10946: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10266: \$? = $ac_status" >&5
-+  echo "$as_me:10881: \$? = $ac_status" >&5
++  echo "$as_me:10949: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_shmat=yes
  else
-@@ -10273,11 +10888,11 @@
+@@ -10273,11 +10956,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:10276: result: $ac_cv_func_shmat" >&5
-+echo "$as_me:10891: result: $ac_cv_func_shmat" >&5
++echo "$as_me:10959: result: $ac_cv_func_shmat" >&5
  echo "${ECHO_T}$ac_cv_func_shmat" >&6
  
      if test $ac_cv_func_shmat = no; then
 -      echo "$as_me:10280: checking for shmat in -lipc" >&5
-+      echo "$as_me:10895: checking for shmat in -lipc" >&5
++      echo "$as_me:10963: 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
-@@ -10285,7 +10900,7 @@
+@@ -10285,7 +10968,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10288 "configure"
-+#line 10903 "configure"
++#line 10971 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10304,16 +10919,16 @@
+@@ -10304,16 +10987,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10307: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10922: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10990: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10310: \$? = $ac_status" >&5
-+  echo "$as_me:10925: \$? = $ac_status" >&5
++  echo "$as_me:10993: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10313: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10996: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10316: \$? = $ac_status" >&5
-+  echo "$as_me:10931: \$? = $ac_status" >&5
++  echo "$as_me:10999: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_ipc_shmat=yes
  else
-@@ -10324,7 +10939,7 @@
+@@ -10324,7 +11007,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10327: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "$as_me:10942: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:11010: result: $ac_cv_lib_ipc_shmat" >&5
  echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-@@ -10342,7 +10957,7 @@
+@@ -10342,7 +11025,7 @@
    # 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:10345: checking for IceConnectionNumber in -lICE" >&5
-+  echo "$as_me:10960: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:11028: 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
-@@ -10350,7 +10965,7 @@
+@@ -10350,7 +11033,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10353 "configure"
-+#line 10968 "configure"
++#line 11036 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10369,16 +10984,16 @@
+@@ -10369,16 +11052,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10372: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10375: \$? = $ac_status" >&5
-+  echo "$as_me:10990: \$? = $ac_status" >&5
++  echo "$as_me:11058: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10381: \$? = $ac_status" >&5
-+  echo "$as_me:10996: \$? = $ac_status" >&5
++  echo "$as_me:11064: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_ICE_IceConnectionNumber=yes
  else
-@@ -10389,7 +11004,7 @@
+@@ -10389,7 +11072,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10392: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "$as_me:11007: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:11075: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-@@ -10401,7 +11016,7 @@
+@@ -10401,7 +11084,7 @@
  
  cf_x_athena=${cf_x_athena:-Xaw}
  
 -echo "$as_me:10404: checking if you want to link with Xaw 3d library" >&5
-+echo "$as_me:11019: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:11087: 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=
  
-@@ -10412,14 +11027,14 @@
+@@ -10412,14 +11095,14 @@
  fi;
  if test "$withval" = yes ; then
         cf_x_athena=Xaw3d
 -       echo "$as_me:10415: result: yes" >&5
-+       echo "$as_me:11030: result: yes" >&5
++       echo "$as_me:11098: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -       echo "$as_me:10418: result: no" >&5
-+       echo "$as_me:11033: result: no" >&5
++       echo "$as_me:11101: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:10422: checking if you want to link with neXT Athena library" >&5
-+echo "$as_me:11037: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:11105: 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=
  
-@@ -10430,14 +11045,14 @@
+@@ -10430,14 +11113,14 @@
  fi;
  if test "$withval" = yes ; then
         cf_x_athena=neXtaw
 -       echo "$as_me:10433: result: yes" >&5
-+       echo "$as_me:11048: result: yes" >&5
++       echo "$as_me:11116: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -       echo "$as_me:10436: result: no" >&5
-+       echo "$as_me:11051: result: no" >&5
++       echo "$as_me:11119: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:10440: checking if you want to link with Athena-Plus library" >&5
-+echo "$as_me:11055: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:11123: 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=
  
-@@ -10448,10 +11063,10 @@
+@@ -10448,10 +11131,10 @@
  fi;
  if test "$withval" = yes ; then
         cf_x_athena=XawPlus
 -       echo "$as_me:10451: result: yes" >&5
-+       echo "$as_me:11066: result: yes" >&5
++       echo "$as_me:11134: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -       echo "$as_me:10454: result: no" >&5
-+       echo "$as_me:11069: result: no" >&5
++       echo "$as_me:11137: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -10471,17 +11086,17 @@
+@@ -10471,17 +11154,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
         test -n "$verbose" && echo "    found package $cf_athena_pkg" 1>&6
  
 -echo "${as_me:-configure}:10474: testing found package $cf_athena_pkg ..." 1>&5
-+echo "${as_me:-configure}:11089: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:11157: testing found package $cf_athena_pkg ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
@@ -49753 +68666 @@
  
 -echo "${as_me:-configure}:10480: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11095: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11163: 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
  
 -echo "${as_me:-configure}:10484: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11099: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11167: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10571,14 +11186,14 @@
+@@ -10571,14 +11254,14 @@
  #define $cf_x_athena_LIBS 1
  EOF
  
 -echo "$as_me:10574: checking for usable $cf_x_athena/Xmu package" >&5
-+echo "$as_me:11189: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:11257: 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
@@ -49775 +68688 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10581 "configure"
-+#line 11196 "configure"
++#line 11264 "configure"
  #include "confdefs.h"
  
  #include <X11/Xmu/CharSet.h>
-@@ -10594,16 +11209,16 @@
+@@ -10594,16 +11277,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10597: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11212: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11280: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10600: \$? = $ac_status" >&5
-+  echo "$as_me:11215: \$? = $ac_status" >&5
++  echo "$as_me:11283: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11286: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10606: \$? = $ac_status" >&5
-+  echo "$as_me:11221: \$? = $ac_status" >&5
++  echo "$as_me:11289: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xaw_compat=yes
  else
-@@ -10613,7 +11228,7 @@
+@@ -10613,7 +11296,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:10616: result: $cf_cv_xaw_compat" >&5
-+echo "$as_me:11231: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:11299: result: $cf_cv_xaw_compat" >&5
  echo "${ECHO_T}$cf_cv_xaw_compat" >&6
  
                         if test "$cf_cv_xaw_compat" = no
-@@ -10625,22 +11240,22 @@
+@@ -10625,22 +11308,22 @@
                                 *)
                                         test -n "$verbose" && echo "    work around broken package" 1>&6
  
 -echo "${as_me:-configure}:10628: testing work around broken package ..." 1>&5
-+echo "${as_me:-configure}:11243: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:11311: testing work around broken package ..." 1>&5
  
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
@@ -49820 +68733 @@
  
 -echo "${as_me:-configure}:10633: testing found package xmu ..." 1>&5
-+echo "${as_me:-configure}:11248: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:11316: testing found package xmu ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
@@ -49827 +68740 @@
  
 -echo "${as_me:-configure}:10639: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11254: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11322: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
  
         test -n "$verbose" && echo "    package xmu LIBS: $cf_pkgconfig_libs" 1>&6
  
 -echo "${as_me:-configure}:10643: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11258: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11326: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10726,12 +11341,12 @@
+@@ -10726,12 +11409,12 @@
  
  test -n "$verbose" && echo "   ...before $LIBS" 1>&6
  
 -echo "${as_me:-configure}:10729: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11344: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11412: testing ...before $LIBS ..." 1>&5
  
  LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/  / /g'`
@@ -49847 +68760 @@
  
 -echo "${as_me:-configure}:10734: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11349: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -10752,17 +11367,17 @@
++echo "${as_me:-configure}:11417: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -10752,17 +11435,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
         test -n "$verbose" && echo "    found package Xext" 1>&6
  
 -echo "${as_me:-configure}:10755: testing found package Xext ..." 1>&5
-+echo "${as_me:-configure}:11370: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:11438: testing found package Xext ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
@@ -49863 +68776 @@
  
 -echo "${as_me:-configure}:10761: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11376: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11444: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
  
         test -n "$verbose" && echo "    package Xext LIBS: $cf_pkgconfig_libs" 1>&6
  
 -echo "${as_me:-configure}:10765: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11380: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11448: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -10846,7 +11461,7 @@
+@@ -10846,7 +11529,7 @@
         :
  else
  
 -       echo "$as_me:10849: checking for XextCreateExtension in -lXext" >&5
-+       echo "$as_me:11464: checking for XextCreateExtension in -lXext" >&5
++       echo "$as_me:11532: 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
-@@ -10854,7 +11469,7 @@
+@@ -10854,7 +11537,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXext  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10857 "configure"
-+#line 11472 "configure"
++#line 11540 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10873,16 +11488,16 @@
+@@ -10873,16 +11556,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10876: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11491: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11559: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10879: \$? = $ac_status" >&5
-+  echo "$as_me:11494: \$? = $ac_status" >&5
++  echo "$as_me:11562: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10882: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10885: \$? = $ac_status" >&5
-+  echo "$as_me:11500: \$? = $ac_status" >&5
++  echo "$as_me:11568: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_Xext_XextCreateExtension=yes
  else
-@@ -10893,7 +11508,7 @@
+@@ -10893,7 +11576,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10896: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
-+echo "$as_me:11511: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:11579: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
  echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
  if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
    LIBS="-lXext $LIBS"
-@@ -10906,17 +11521,17 @@
+@@ -10906,17 +11589,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
         test -n "$verbose" && echo "    found package xt" 1>&6
  
 -echo "${as_me:-configure}:10909: testing found package xt ..." 1>&5
-+echo "${as_me:-configure}:11524: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11592: testing found package xt ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
@@ -49932 +68845 @@
  
 -echo "${as_me:-configure}:10915: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11530: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11598: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
  
         test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
  
 -echo "${as_me:-configure}:10919: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11534: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11602: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11003,14 +11618,14 @@
+@@ -11003,14 +11686,14 @@
                 ;;
         *)
  # we have an "xt" package, but it may omit Xt's dependency on X11
 -echo "$as_me:11006: checking for usable X dependency" >&5
-+echo "$as_me:11621: checking for usable X dependency" >&5
++echo "$as_me:11689: 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
@@ -49954 +68867 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11013 "configure"
-+#line 11628 "configure"
++#line 11696 "configure"
  #include "confdefs.h"
  
  #include <X11/Xlib.h>
-@@ -11029,16 +11644,16 @@
+@@ -11029,16 +11712,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11032: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11647: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11715: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11035: \$? = $ac_status" >&5
-+  echo "$as_me:11650: \$? = $ac_status" >&5
++  echo "$as_me:11718: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11038: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11721: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11041: \$? = $ac_status" >&5
-+  echo "$as_me:11656: \$? = $ac_status" >&5
++  echo "$as_me:11724: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xt_x11_compat=yes
  else
-@@ -11048,30 +11663,30 @@
+@@ -11048,30 +11731,30 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:11051: result: $cf_cv_xt_x11_compat" >&5
-+echo "$as_me:11666: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:11734: result: $cf_cv_xt_x11_compat" >&5
  echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
                 if test "$cf_cv_xt_x11_compat" = no
@@ -49991 +68904 @@
  
 -echo "${as_me:-configure}:11057: testing work around broken X11 dependency ..." 1>&5
-+echo "${as_me:-configure}:11672: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:11740: testing work around broken X11 dependency ..." 1>&5
  
                         # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
@@ -49999 +68912 @@
  
 -echo "${as_me:-configure}:11064: testing found package x11 ..." 1>&5
-+echo "${as_me:-configure}:11679: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:11747: testing found package x11 ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
@@ -50006 +68919 @@
  
 -echo "${as_me:-configure}:11070: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11685: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11753: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
  
         test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
  
 -echo "${as_me:-configure}:11074: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11689: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11757: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11157,12 +11772,12 @@
+@@ -11157,12 +11840,12 @@
  
  test -n "$verbose" && echo "   ...before $LIBS" 1>&6
  
 -echo "${as_me:-configure}:11160: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11775: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11843: testing ...before $LIBS ..." 1>&5
  
  LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/  / /g'`
@@ -50026 +68939 @@
  
 -echo "${as_me:-configure}:11165: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11780: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -11170,14 +11785,14 @@
++echo "${as_me:-configure}:11848: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -11170,14 +11853,14 @@
                 ;;
         esac
  
 -echo "$as_me:11173: checking for usable X Toolkit package" >&5
-+echo "$as_me:11788: checking for usable X Toolkit package" >&5
++echo "$as_me:11856: 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
@@ -50043 +68956 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11180 "configure"
-+#line 11795 "configure"
++#line 11863 "configure"
  #include "confdefs.h"
  
  #include <X11/Shell.h>
-@@ -11192,16 +11807,16 @@
+@@ -11192,16 +11875,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11195: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11878: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11198: \$? = $ac_status" >&5
-+  echo "$as_me:11813: \$? = $ac_status" >&5
++  echo "$as_me:11881: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11884: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11204: \$? = $ac_status" >&5
-+  echo "$as_me:11819: \$? = $ac_status" >&5
++  echo "$as_me:11887: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_xt_ice_compat=yes
  else
-@@ -11211,7 +11826,7 @@
+@@ -11211,7 +11894,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:11214: result: $cf_cv_xt_ice_compat" >&5
-+echo "$as_me:11829: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:11897: result: $cf_cv_xt_ice_compat" >&5
  echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
  
         if test "$cf_cv_xt_ice_compat" = no
-@@ -11225,22 +11840,22 @@
+@@ -11225,22 +11908,22 @@
                         *)
                                 test -n "$verbose" && echo "    work around broken ICE dependency" 1>&6
  
 -echo "${as_me:-configure}:11228: testing work around broken ICE dependency ..." 1>&5
-+echo "${as_me:-configure}:11843: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:11911: testing work around broken ICE dependency ..." 1>&5
  
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
@@ -50088 +69001 @@
  
 -echo "${as_me:-configure}:11233: testing found package ice ..." 1>&5
-+echo "${as_me:-configure}:11848: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:11916: testing found package ice ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
@@ -50095 +69008 @@
  
 -echo "${as_me:-configure}:11239: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11854: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11922: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
  
         test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
  
 -echo "${as_me:-configure}:11243: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11858: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11926: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11325,17 +11940,17 @@
+@@ -11325,17 +12008,17 @@
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
         test -n "$verbose" && echo "    found package sm" 1>&6
  
 -echo "${as_me:-configure}:11328: testing found package sm ..." 1>&5
-+echo "${as_me:-configure}:11943: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:12011: testing found package sm ..." 1>&5
  
         cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
@@ -50116 +69029 @@
  
 -echo "${as_me:-configure}:11334: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11949: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12017: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
  
         test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
  
 -echo "${as_me:-configure}:11338: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11953: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12021: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
  
  cf_fix_cppflags=no
  cf_new_cflags=
-@@ -11425,12 +12040,12 @@
+@@ -11425,12 +12108,12 @@
  
  test -n "$verbose" && echo "   ...before $LIBS" 1>&6
  
 -echo "${as_me:-configure}:11428: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:12043: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:12111: testing ...before $LIBS ..." 1>&5
  
  LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
@@ -50136 +69049 @@
  
 -echo "${as_me:-configure}:11433: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:12048: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -11448,7 +12063,7 @@
++echo "${as_me:-configure}:12116: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -11448,7 +12131,7 @@
  
  test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
  
 -echo "${as_me:-configure}:11451: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12066: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12134: testing checking additions to CFLAGS ..." 1>&5
  
  cf_check_cflags="$CFLAGS"
  cf_check_cppflags="$CPPFLAGS"
-@@ -11519,7 +12134,7 @@
+@@ -11519,7 +12202,7 @@
  if test -n "$cf_new_cflags" ; then
         test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
  
 -echo "${as_me:-configure}:11522: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:12137: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
  
         CFLAGS="$CFLAGS $cf_new_cflags"
  fi
-@@ -11527,7 +12142,7 @@
+@@ -11527,7 +12210,7 @@
  if test -n "$cf_new_cppflags" ; then
         test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
  
 -echo "${as_me:-configure}:11530: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12145: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12213: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
  
         CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
  fi
-@@ -11535,14 +12150,14 @@
+@@ -11535,14 +12218,14 @@
  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}:11538: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12153: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12221: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
  
         EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
@@ -50180 +69093 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11545 "configure"
-+#line 12160 "configure"
++#line 12228 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -11554,16 +12169,16 @@
+@@ -11554,16 +12237,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11557: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12240: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11560: \$? = $ac_status" >&5
-+  echo "$as_me:12175: \$? = $ac_status" >&5
++  echo "$as_me:12243: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11563: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12246: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11566: \$? = $ac_status" >&5
-+  echo "$as_me:12181: \$? = $ac_status" >&5
++  echo "$as_me:12249: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -11571,12 +12186,12 @@
+@@ -11571,12 +12254,12 @@
  cat conftest.$ac_ext >&5
  test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
  
 -echo "${as_me:-configure}:11574: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12189: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12257: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
  
          if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
@@ -50216 +69129 @@
  
 -echo "${as_me:-configure}:11579: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12194: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12262: testing but keeping change to \$CPPFLAGS ..." 1>&5
  
          fi
          CFLAGS="$cf_check_flags"
-@@ -11584,13 +12199,13 @@
+@@ -11584,13 +12267,13 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
  
 -       echo "$as_me:11587: checking for XOpenDisplay" >&5
-+       echo "$as_me:12202: checking for XOpenDisplay" >&5
++       echo "$as_me:12270: checking for XOpenDisplay" >&5
  echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
  if test "${ac_cv_func_XOpenDisplay+set}" = set; then
@@ -50232 +69145 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 11593 "configure"
-+#line 12208 "configure"
++#line 12276 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char XOpenDisplay (); below.  */
-@@ -11621,16 +12236,16 @@
+@@ -11613,7 +12296,7 @@
+ #if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay)
+ choke me
+ #else
+-f = XOpenDisplay;
++f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -11621,16 +12304,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11624: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12307: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11627: \$? = $ac_status" >&5
-+  echo "$as_me:12242: \$? = $ac_status" >&5
++  echo "$as_me:12310: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11633: \$? = $ac_status" >&5
-+  echo "$as_me:12248: \$? = $ac_status" >&5
++  echo "$as_me:12316: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_XOpenDisplay=yes
  else
-@@ -11640,13 +12255,13 @@
+@@ -11640,13 +12323,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:11643: result: $ac_cv_func_XOpenDisplay" >&5
-+echo "$as_me:12258: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:12326: result: $ac_cv_func_XOpenDisplay" >&5
  echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
  if test $ac_cv_func_XOpenDisplay = yes; then
@@ -50269 +69191 @@
  
 -       echo "$as_me:11649: checking for XOpenDisplay in -lX11" >&5
-+       echo "$as_me:12264: checking for XOpenDisplay in -lX11" >&5
++       echo "$as_me:12332: 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
-@@ -11654,7 +12269,7 @@
+@@ -11654,7 +12337,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11657 "configure"
-+#line 12272 "configure"
++#line 12340 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11673,16 +12288,16 @@
+@@ -11673,16 +12356,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11676: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11679: \$? = $ac_status" >&5
-+  echo "$as_me:12294: \$? = $ac_status" >&5
++  echo "$as_me:12362: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11682: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11685: \$? = $ac_status" >&5
-+  echo "$as_me:12300: \$? = $ac_status" >&5
++  echo "$as_me:12368: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_X11_XOpenDisplay=yes
  else
-@@ -11693,7 +12308,7 @@
+@@ -11693,7 +12376,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:11696: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:12311: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12379: result: $ac_cv_lib_X11_XOpenDisplay" >&5
  echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
  if test $ac_cv_lib_X11_XOpenDisplay = yes; then
    LIBS="-lX11 $LIBS"
-@@ -11701,13 +12316,13 @@
+@@ -11701,13 +12384,13 @@
  
  fi
  
 -       echo "$as_me:11704: checking for XtAppInitialize" >&5
-+       echo "$as_me:12319: checking for XtAppInitialize" >&5
++       echo "$as_me:12387: checking for XtAppInitialize" >&5
  echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
  if test "${ac_cv_func_XtAppInitialize+set}" = set; then
@@ -50324 +69246 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 11710 "configure"
-+#line 12325 "configure"
++#line 12393 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char XtAppInitialize (); below.  */
-@@ -11738,16 +12353,16 @@
+@@ -11730,7 +12413,7 @@
+ #if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize)
+ choke me
+ #else
+-f = XtAppInitialize;
++f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -11738,16 +12421,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11741: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12356: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11744: \$? = $ac_status" >&5
-+  echo "$as_me:12359: \$? = $ac_status" >&5
++  echo "$as_me:12427: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11747: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11750: \$? = $ac_status" >&5
-+  echo "$as_me:12365: \$? = $ac_status" >&5
++  echo "$as_me:12433: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_XtAppInitialize=yes
  else
-@@ -11757,13 +12372,13 @@
+@@ -11757,13 +12440,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:11760: result: $ac_cv_func_XtAppInitialize" >&5
-+echo "$as_me:12375: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:12443: result: $ac_cv_func_XtAppInitialize" >&5
  echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
  if test $ac_cv_func_XtAppInitialize = yes; then
@@ -50361 +69292 @@
  
 -       echo "$as_me:11766: checking for XtAppInitialize in -lXt" >&5
-+       echo "$as_me:12381: checking for XtAppInitialize in -lXt" >&5
++       echo "$as_me:12449: 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
-@@ -11771,7 +12386,7 @@
+@@ -11771,7 +12454,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11774 "configure"
-+#line 12389 "configure"
++#line 12457 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11790,16 +12405,16 @@
+@@ -11790,16 +12473,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12476: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11796: \$? = $ac_status" >&5
-+  echo "$as_me:12411: \$? = $ac_status" >&5
++  echo "$as_me:12479: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12482: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11802: \$? = $ac_status" >&5
-+  echo "$as_me:12417: \$? = $ac_status" >&5
++  echo "$as_me:12485: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_Xt_XtAppInitialize=yes
  else
-@@ -11810,7 +12425,7 @@
+@@ -11810,7 +12493,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:11813: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
-+echo "$as_me:12428: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:12496: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
  echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
  if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
    cat >>confdefs.h <<\EOF
-@@ -11826,7 +12441,7 @@
+@@ -11826,7 +12509,7 @@
  fi
  
  if test $cf_have_X_LIBS = no ; then
 -       { echo "$as_me:11829: WARNING: Unable to successfully link X Toolkit library (-lXt) with
-+       { echo "$as_me:12444: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++       { echo "$as_me:12512: 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
-@@ -11848,14 +12463,14 @@
+@@ -11848,14 +12531,14 @@
                 cf_test=X11/$cf_x_athena_root/SimpleMenu.h
                 if test $cf_path != default ; then
                         CPPFLAGS="$cf_save -I$cf_path/include"
 -                       echo "$as_me:11851: checking for $cf_test in $cf_path" >&5
-+                       echo "$as_me:12466: checking for $cf_test in $cf_path" >&5
++                       echo "$as_me:12534: checking for $cf_test in $cf_path" >&5
  echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
                 else
 -                       echo "$as_me:11854: checking for $cf_test" >&5
-+                       echo "$as_me:12469: checking for $cf_test" >&5
++                       echo "$as_me:12537: checking for $cf_test" >&5
  echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                 fi
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 11858 "configure"
-+#line 12473 "configure"
++#line 12541 "configure"
  #include "confdefs.h"
  
  #include <X11/Intrinsic.h>
-@@ -11869,16 +12484,16 @@
+@@ -11869,16 +12552,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11872: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12555: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11875: \$? = $ac_status" >&5
-+  echo "$as_me:12490: \$? = $ac_status" >&5
++  echo "$as_me:12558: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11878: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12561: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11881: \$? = $ac_status" >&5
-+  echo "$as_me:12496: \$? = $ac_status" >&5
++  echo "$as_me:12564: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -11887,7 +12502,7 @@
+@@ -11887,7 +12570,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -               echo "$as_me:11890: result: $cf_result" >&5
-+               echo "$as_me:12505: result: $cf_result" >&5
++               echo "$as_me:12573: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
                 if test "$cf_result" = yes ; then
                         cf_x_athena_inc=$cf_path
-@@ -11899,7 +12514,7 @@
+@@ -11899,7 +12582,7 @@
  done
  
  if test -z "$cf_x_athena_inc" ; then
 -       { echo "$as_me:11902: WARNING: Unable to successfully find Athena header files with test program" >&5
-+       { echo "$as_me:12517: WARNING: Unable to successfully find Athena header files with test program" >&5
++       { echo "$as_me:12585: WARNING: Unable to successfully find Athena header files with test program" >&5
  echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
  elif test "$cf_x_athena_inc" != default ; then
         CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
-@@ -11915,24 +12530,29 @@
+@@ -11915,24 +12598,29 @@
         /usr/local
  do
@@ -50494 +69425 @@
 -echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 +                               LIBS="-L$cf_path/lib $cf_libs $LIBS"
-+                               echo "$as_me:12547: checking for $cf_libs in $cf_path" >&5
++                               echo "$as_me:12615: checking for $cf_libs in $cf_path" >&5
 +echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
                         else
@@ -50501 +69432 @@
 -echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 +                               LIBS="$cf_libs $LIBS"
-+                               echo "$as_me:12551: checking for $cf_test in $cf_libs" >&5
++                               echo "$as_me:12619: checking for $cf_test in $cf_libs" >&5
 +echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
                         fi
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 11935 "configure"
-+#line 12555 "configure"
++#line 12623 "configure"
  #include "confdefs.h"
  
  #include <X11/Intrinsic.h>
-@@ -11948,16 +12568,16 @@
+@@ -11948,16 +12636,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11951: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12639: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11954: \$? = $ac_status" >&5
-+  echo "$as_me:12574: \$? = $ac_status" >&5
++  echo "$as_me:12642: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11957: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11960: \$? = $ac_status" >&5
-+  echo "$as_me:12580: \$? = $ac_status" >&5
++  echo "$as_me:12648: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -11966,19 +12586,21 @@
+@@ -11966,19 +12654,21 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -                       echo "$as_me:11969: result: $cf_result" >&5
-+                       echo "$as_me:12589: result: $cf_result" >&5
++                       echo "$as_me:12657: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
                         if test "$cf_result" = yes ; then
@@ -50553 +69484 @@
  if test -z "$cf_x_athena_lib" ; then
 -       { { echo "$as_me:11981: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
-+       { { echo "$as_me:12603: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++       { { echo "$as_me:12671: 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
-@@ -11991,48 +12613,86 @@
+@@ -11991,48 +12681,86 @@
  
  fi
@@ -50567 +69498 @@
 +    # 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:12621: checking for $ac_word" >&5
++echo "$as_me:12689: 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
@@ -50582 +69513 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:12636: found $ac_dir/$ac_word" >&5
++echo "$as_me:12704: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -50590 +69521 @@
 +XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 +if test -n "$XCURSES_CONFIG"; then
-+  echo "$as_me:12644: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:12712: result: $XCURSES_CONFIG" >&5
 +echo "${ECHO_T}$XCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:12647: result: no" >&5
++  echo "$as_me:12715: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -50607 +69538 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:11998: checking for $ac_word" >&5
-+echo "$as_me:12660: checking for $ac_word" >&5
++echo "$as_me:12728: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
@@ -50633 +69564 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-+echo "$as_me:12675: found $ac_dir/$ac_word" >&5
++echo "$as_me:12743: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -50648 +69579 @@
 +ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 +if test -n "$ac_ct_XCURSES_CONFIG"; then
-+  echo "$as_me:12683: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:12751: result: $ac_ct_XCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
  else
 -  echo "$as_me:12029: result: no" >&5
-+  echo "$as_me:12686: result: no" >&5
++  echo "$as_me:12754: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -50667 +69598 @@
  if test "$XCURSES_CONFIG" != none ; then
  
-@@ -12047,7 +12707,7 @@
+@@ -12047,7 +12775,7 @@
  
  test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
  
 -echo "${as_me:-configure}:12050: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12710: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12778: testing checking additions to CFLAGS ..." 1>&5
  
  cf_check_cflags="$CFLAGS"
  cf_check_cppflags="$CPPFLAGS"
-@@ -12118,7 +12778,7 @@
+@@ -12118,7 +12846,7 @@
  if test -n "$cf_new_cflags" ; then
         test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
  
 -echo "${as_me:-configure}:12121: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:12781: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12849: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
  
         CFLAGS="$CFLAGS $cf_new_cflags"
  fi
-@@ -12126,7 +12786,7 @@
+@@ -12126,7 +12854,7 @@
  if test -n "$cf_new_cppflags" ; then
         test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
  
 -echo "${as_me:-configure}:12129: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12789: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12857: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
  
         CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
  fi
-@@ -12134,14 +12794,14 @@
+@@ -12134,14 +12862,14 @@
  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}:12137: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12865: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
  
         EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
@@ -50707 +69638 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12144 "configure"
-+#line 12804 "configure"
++#line 12872 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -12153,16 +12813,16 @@
+@@ -12153,16 +12881,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12156: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12884: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12159: \$? = $ac_status" >&5
-+  echo "$as_me:12819: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12162: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12890: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12165: \$? = $ac_status" >&5
-+  echo "$as_me:12825: \$? = $ac_status" >&5
++  echo "$as_me:12893: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12170,12 +12830,12 @@
+@@ -12170,12 +12898,12 @@
  cat conftest.$ac_ext >&5
  test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
  
 -echo "${as_me:-configure}:12173: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12833: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12901: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
  
          if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
@@ -50743 +69674 @@
  
 -echo "${as_me:-configure}:12178: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12838: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12906: testing but keeping change to \$CPPFLAGS ..." 1>&5
  
          fi
          CFLAGS="$cf_check_flags"
-@@ -12183,7 +12843,7 @@
+@@ -12183,7 +12911,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
  
 -echo "$as_me:12186: checking for XOpenDisplay in -lX11" >&5
-+echo "$as_me:12846: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:12914: 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
-@@ -12191,7 +12851,7 @@
+@@ -12191,7 +12919,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12194 "configure"
-+#line 12854 "configure"
++#line 12922 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12210,16 +12870,16 @@
+@@ -12210,16 +12938,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12213: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12941: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12216: \$? = $ac_status" >&5
-+  echo "$as_me:12876: \$? = $ac_status" >&5
++  echo "$as_me:12944: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12947: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12222: \$? = $ac_status" >&5
-+  echo "$as_me:12882: \$? = $ac_status" >&5
++  echo "$as_me:12950: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_X11_XOpenDisplay=yes
  else
-@@ -12230,13 +12890,13 @@
+@@ -12230,13 +12958,13 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12233: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:12893: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12961: result: $ac_cv_lib_X11_XOpenDisplay" >&5
  echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
  if test $ac_cv_lib_X11_XOpenDisplay = yes; then
@@ -50798 +69729 @@
  
 -echo "$as_me:12239: checking for XCurses library" >&5
-+echo "$as_me:12899: checking for XCurses library" >&5
++echo "$as_me:12967: 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
-@@ -12244,7 +12904,7 @@
+@@ -12244,7 +12972,7 @@
  
  LIBS="-lXCurses $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12247 "configure"
-+#line 12907 "configure"
++#line 12975 "configure"
  #include "confdefs.h"
  
  #include <xcurses.h>
-@@ -12259,16 +12919,16 @@
+@@ -12259,16 +12987,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12262: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12922: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12265: \$? = $ac_status" >&5
-+  echo "$as_me:12925: \$? = $ac_status" >&5
++  echo "$as_me:12993: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12268: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12996: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12271: \$? = $ac_status" >&5
-+  echo "$as_me:12931: \$? = $ac_status" >&5
++  echo "$as_me:12999: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_lib_XCurses=yes
  else
-@@ -12279,7 +12939,7 @@
+@@ -12279,7 +13007,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:12282: result: $cf_cv_lib_XCurses" >&5
-+echo "$as_me:12942: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:13010: result: $cf_cv_lib_XCurses" >&5
  echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
  
  fi
-@@ -12293,23 +12953,23 @@
+@@ -12293,23 +13021,23 @@
  #define XCURSES 1
  EOF
  
 -       echo "$as_me:12296: checking for xcurses.h" >&5
-+       echo "$as_me:12956: checking for xcurses.h" >&5
++       echo "$as_me:13024: 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
@@ -50853 +69784 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12302 "configure"
-+#line 12962 "configure"
++#line 13030 "configure"
  #include "confdefs.h"
  #include <xcurses.h>
  _ACEOF
 -if { (eval echo "$as_me:12306: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12966: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13034: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -50865 +69796 @@
    cat conftest.err >&5
 -  echo "$as_me:12312: \$? = $ac_status" >&5
-+  echo "$as_me:12972: \$? = $ac_status" >&5
++  echo "$as_me:13040: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12328,7 +12988,7 @@
+@@ -12328,7 +13056,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:12331: result: $ac_cv_header_xcurses_h" >&5
-+echo "$as_me:12991: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:13059: result: $ac_cv_header_xcurses_h" >&5
  echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
  if test $ac_cv_header_xcurses_h = yes; then
    cat >>confdefs.h <<\EOF
-@@ -12338,7 +12998,7 @@
+@@ -12338,7 +13066,7 @@
  fi
  
  else
 -       { { echo "$as_me:12341: error: Cannot link with XCurses" >&5
-+       { { echo "$as_me:13001: error: Cannot link with XCurses" >&5
++       { { echo "$as_me:13069: error: Cannot link with XCurses" >&5
  echo "$as_me: error: Cannot link with XCurses" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -12346,6 +13006,122 @@
+@@ -12346,6 +13074,122 @@
         ;;
  esac
@@ -50894 +69825 @@
 +curses|curses_*)
 +
-+echo "$as_me:13012: checking for NetBSD form.h" >&5
++echo "$as_me:13080: 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
@@ -50901 +69832 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 13019 "configure"
++#line 13087 "configure"
 +#include "confdefs.h"
 +
@@ -50920 +69851 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13038: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13041: \$? = $ac_status" >&5
++  echo "$as_me:13109: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13044: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13047: \$? = $ac_status" >&5
++  echo "$as_me:13115: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_netbsd_form_h=yes
@@ -50941 +69872 @@
 +
 +fi
-+echo "$as_me:13059: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:13127: result: $cf_cv_netbsd_form_h" >&5
 +echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 +
@@ -50948 +69879 @@
 +EOF
 +
-+echo "$as_me:13066: checking for NetBSD menu.h" >&5
++echo "$as_me:13134: 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
@@ -50955 +69886 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 13073 "configure"
++#line 13141 "configure"
 +#include "confdefs.h"
 +
@@ -50973 +69904 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13159: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13094: \$? = $ac_status" >&5
++  echo "$as_me:13162: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13100: \$? = $ac_status" >&5
++  echo "$as_me:13168: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_netbsd_menu_h=yes
@@ -50994 +69925 @@
 +
 +fi
-+echo "$as_me:13112: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:13180: result: $cf_cv_netbsd_menu_h" >&5
 +echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 +
@@ -51010 +69941 @@
  pdcurses) #(vi
         ;;
-@@ -12353,7 +13129,7 @@
+@@ -12353,7 +13197,7 @@
         # look for curses-related libraries
  
  as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
 -echo "$as_me:12356: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-+echo "$as_me:13132: checking for new_panel in -lpanel$cf_cv_libtype" >&5
++echo "$as_me:13200: checking for new_panel in -lpanel$cf_cv_libtype" >&5
  echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12361,7 +13137,7 @@
+@@ -12361,7 +13205,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpanel$cf_cv_libtype  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12364 "configure"
-+#line 13140 "configure"
++#line 13208 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12380,16 +13156,16 @@
+@@ -12380,16 +13224,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12383: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13227: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12386: \$? = $ac_status" >&5
-+  echo "$as_me:13162: \$? = $ac_status" >&5
++  echo "$as_me:13230: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12389: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12392: \$? = $ac_status" >&5
-+  echo "$as_me:13168: \$? = $ac_status" >&5
++  echo "$as_me:13236: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -12400,7 +13176,7 @@
+@@ -12400,7 +13244,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12403: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13179: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13247: 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
    cat >>confdefs.h <<EOF
-@@ -12412,7 +13188,7 @@
+@@ -12412,7 +13256,7 @@
  fi
  
  as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
 -echo "$as_me:12415: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-+echo "$as_me:13191: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
++echo "$as_me:13259: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
  echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12420,7 +13196,7 @@
+@@ -12420,7 +13264,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmenu$cf_cv_libtype  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12423 "configure"
-+#line 13199 "configure"
++#line 13267 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12439,16 +13215,16 @@
+@@ -12439,16 +13283,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12442: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13218: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13286: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12445: \$? = $ac_status" >&5
-+  echo "$as_me:13221: \$? = $ac_status" >&5
++  echo "$as_me:13289: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12448: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13292: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12451: \$? = $ac_status" >&5
-+  echo "$as_me:13227: \$? = $ac_status" >&5
++  echo "$as_me:13295: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -12459,7 +13235,7 @@
+@@ -12459,7 +13303,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12462: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13238: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13306: 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
    cat >>confdefs.h <<EOF
-@@ -12471,7 +13247,7 @@
+@@ -12471,7 +13315,7 @@
  fi
  
  as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
 -echo "$as_me:12474: checking for form_driver in -lform$cf_cv_libtype" >&5
-+echo "$as_me:13250: checking for form_driver in -lform$cf_cv_libtype" >&5
++echo "$as_me:13318: checking for form_driver in -lform$cf_cv_libtype" >&5
  echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12479,7 +13255,7 @@
+@@ -12479,7 +13323,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lform$cf_cv_libtype  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12482 "configure"
-+#line 13258 "configure"
++#line 13326 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12498,16 +13274,16 @@
+@@ -12498,16 +13342,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13277: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13345: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12504: \$? = $ac_status" >&5
-+  echo "$as_me:13280: \$? = $ac_status" >&5
++  echo "$as_me:13348: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13283: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12510: \$? = $ac_status" >&5
-+  echo "$as_me:13286: \$? = $ac_status" >&5
++  echo "$as_me:13354: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -12518,7 +13294,7 @@
+@@ -12518,7 +13362,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12521: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13297: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13365: 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
    cat >>confdefs.h <<EOF
-@@ -12541,23 +13317,23 @@
+@@ -12541,23 +13385,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:12544: checking for $ac_header" >&5
-+echo "$as_me:13320: checking for $ac_header" >&5
++echo "$as_me:13388: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -51166 +70097 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12550 "configure"
-+#line 13326 "configure"
++#line 13394 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:12554: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13330: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13398: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -51178 +70109 @@
    cat conftest.err >&5
 -  echo "$as_me:12560: \$? = $ac_status" >&5
-+  echo "$as_me:13336: \$? = $ac_status" >&5
++  echo "$as_me:13404: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12576,7 +13352,7 @@
+@@ -12576,7 +13420,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:12579: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13355: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13423: 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
-@@ -12589,13 +13365,13 @@
+@@ -12589,13 +13433,13 @@
         ;;
  esac
  
 -echo "$as_me:12592: checking return type of signal handlers" >&5
-+echo "$as_me:13368: checking return type of signal handlers" >&5
++echo "$as_me:13436: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
  if test "${ac_cv_type_signal+set}" = set; then
@@ -51203 +70134 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12598 "configure"
-+#line 13374 "configure"
++#line 13442 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -12617,16 +13393,16 @@
+@@ -12617,16 +13461,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13396: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13464: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12623: \$? = $ac_status" >&5
-+  echo "$as_me:13399: \$? = $ac_status" >&5
++  echo "$as_me:13467: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12626: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13470: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12629: \$? = $ac_status" >&5
-+  echo "$as_me:13405: \$? = $ac_status" >&5
++  echo "$as_me:13473: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signal=void
  else
-@@ -12636,20 +13412,20 @@
+@@ -12636,20 +13480,20 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:12639: result: $ac_cv_type_signal" >&5
-+echo "$as_me:13415: result: $ac_cv_type_signal" >&5
++echo "$as_me:13483: result: $ac_cv_type_signal" >&5
  echo "${ECHO_T}$ac_cv_type_signal" >&6
  
@@ -51241 +70172 @@
  
 -echo "$as_me:12646: checking for ANSI C header files" >&5
-+echo "$as_me:13422: checking for ANSI C header files" >&5
++echo "$as_me:13490: 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
@@ -51248 +70179 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12652 "configure"
-+#line 13428 "configure"
++#line 13496 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -12657,13 +13433,13 @@
+@@ -12657,13 +13501,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:12660: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13436: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13504: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -51264 +70195 @@
    cat conftest.err >&5
 -  echo "$as_me:12666: \$? = $ac_status" >&5
-+  echo "$as_me:13442: \$? = $ac_status" >&5
++  echo "$as_me:13510: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12685,7 +13461,7 @@
+@@ -12685,7 +13529,7 @@
  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 12688 "configure"
-+#line 13464 "configure"
++#line 13532 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -12703,7 +13479,7 @@
+@@ -12703,7 +13547,7 @@
  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 12706 "configure"
-+#line 13482 "configure"
++#line 13550 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -12724,7 +13500,7 @@
+@@ -12724,7 +13568,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12727 "configure"
-+#line 13503 "configure"
++#line 13571 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -12750,15 +13526,15 @@
+@@ -12750,15 +13594,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:12753: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13529: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13597: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12756: \$? = $ac_status" >&5
-+  echo "$as_me:13532: \$? = $ac_status" >&5
++  echo "$as_me:13600: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13602: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12761: \$? = $ac_status" >&5
-+  echo "$as_me:13537: \$? = $ac_status" >&5
++  echo "$as_me:13605: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12771,146 +13547,319 @@
+@@ -12771,146 +13615,319 @@
  fi
  fi
@@ -51325 +70256 @@
 -cat >>confdefs.h <<\EOF
 -#define STDC_HEADERS 1
-+echo "$as_me:13550: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13618: result: $ac_cv_header_stdc" >&5
 +echo "${ECHO_T}$ac_cv_header_stdc" >&6
 +if test $ac_cv_header_stdc = yes; then
@@ -51335 +70266 @@
 +fi
 +
-+echo "$as_me:13560: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:13628: 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
@@ -51341 +70272 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 13566 "configure"
++#line 13634 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -51357 +70288 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13582: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13650: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13585: \$? = $ac_status" >&5
++  echo "$as_me:13653: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13591: \$? = $ac_status" >&5
++  echo "$as_me:13659: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_header_time=yes
@@ -51376 +70307 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +fi
-+echo "$as_me:13601: result: $ac_cv_header_time" >&5
++echo "$as_me:13669: result: $ac_cv_header_time" >&5
 +echo "${ECHO_T}$ac_cv_header_time" >&6
 +if test $ac_cv_header_time = yes; then
@@ -51399 +70330 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:13624: checking for $ac_header" >&5
++echo "$as_me:13692: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -51405 +70336 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 13630 "configure"
++#line 13698 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:13634: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13702: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -51415 +70346 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:13640: \$? = $ac_status" >&5
++  echo "$as_me:13708: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -51434 +70365 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:13659: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13727: 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
@@ -51447 +70378 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:13672: checking for $ac_header" >&5
++echo "$as_me:13740: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -51453 +70384 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 13678 "configure"
++#line 13746 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:13682: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13750: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -51463 +70394 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:13688: \$? = $ac_status" >&5
++  echo "$as_me:13756: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -51482 +70413 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:13707: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13775: 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
@@ -51495 +70426 @@
 -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 "$as_me:13717: checking for header declaring getopt variables" >&5
++echo "$as_me:13785: 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
@@ -51507 +70438 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 13727 "configure"
++#line 13795 "configure"
  #include "confdefs.h"
 -#include <sys/types.h>
@@ -51526 +70457 @@
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12806: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13808: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12809: \$? = $ac_status" >&5
-+  echo "$as_me:13743: \$? = $ac_status" >&5
++  echo "$as_me:13811: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12812: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13814: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12815: \$? = $ac_status" >&5
-+  echo "$as_me:13749: \$? = $ac_status" >&5
++  echo "$as_me:13817: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_header_time=yes
@@ -51558 +70489 @@
 -#define TIME_WITH_SYS_TIME 1
 +fi
-+echo "$as_me:13761: result: $cf_cv_getopt_header" >&5
++echo "$as_me:13829: result: $cf_cv_getopt_header" >&5
 +echo "${ECHO_T}$cf_cv_getopt_header" >&6
 +if test $cf_cv_getopt_header != none ; then
@@ -51587 +70518 @@
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:13776: checking for $ac_func" >&5
++echo "$as_me:13844: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -51594 +70525 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12854 "configure"
-+#line 13782 "configure"
++#line 13850 "configure"
  #include "confdefs.h"
 -#include <$ac_header>
@@ -51618 +70549 @@
 +choke me
 +#else
-+f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 +#endif
 +
@@ -51628 +70559 @@
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:13813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13881: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
    ac_status=$?
@@ -51646 +70577 @@
 -if test -z "$ac_cpp_err"; then
 -  eval "$as_ac_Header=yes"
-+  echo "$as_me:13816: \$? = $ac_status" >&5
++  echo "$as_me:13884: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:13819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:13822: \$? = $ac_status" >&5
++  echo "$as_me:13890: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  eval "$as_ac_var=yes"
@@ -51668 +70599 @@
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+echo "$as_me:13832: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13900: 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
@@ -51696 +70627 @@
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:12907: checking for $ac_func" >&5
-+echo "$as_me:13856: checking for $ac_func" >&5
++echo "$as_me:13924: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -51703 +70634 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12913 "configure"
-+#line 13862 "configure"
++#line 13930 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -12941,16 +13890,16 @@
+@@ -12933,7 +13950,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -12941,16 +13958,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12944: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13961: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12947: \$? = $ac_status" >&5
-+  echo "$as_me:13896: \$? = $ac_status" >&5
++  echo "$as_me:13964: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13967: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12953: \$? = $ac_status" >&5
-+  echo "$as_me:13902: \$? = $ac_status" >&5
++  echo "$as_me:13970: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -12960,7 +13909,7 @@
+@@ -12960,7 +13977,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:12963: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13912: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13980: 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
-@@ -12970,14 +13919,16 @@
+@@ -12970,14 +13987,16 @@
  fi
  done
@@ -51744 +70684 @@
 +fi
 +
-+echo "$as_me:13924: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:13992: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
  echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
  if test "${cf_cv_need_xopen_extension+set}" = set; then
@@ -51752 +70692 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12980 "configure"
-+#line 13931 "configure"
++#line 13999 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -12999,23 +13950,23 @@
+@@ -12999,23 +14018,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13002: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14021: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13005: \$? = $ac_status" >&5
-+  echo "$as_me:13956: \$? = $ac_status" >&5
++  echo "$as_me:14024: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14027: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13011: \$? = $ac_status" >&5
-+  echo "$as_me:13962: \$? = $ac_status" >&5
++  echo "$as_me:14030: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_need_xopen_extension=no
@@ -51781 +70721 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13018 "configure"
-+#line 13969 "configure"
++#line 14037 "configure"
  #include "confdefs.h"
  
  #define _XOPEN_SOURCE_EXTENDED
-@@ -13037,16 +13988,16 @@
+@@ -13037,16 +14056,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13040: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13991: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14059: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13043: \$? = $ac_status" >&5
-+  echo "$as_me:13994: \$? = $ac_status" >&5
++  echo "$as_me:14062: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13046: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14065: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13049: \$? = $ac_status" >&5
-+  echo "$as_me:14000: \$? = $ac_status" >&5
++  echo "$as_me:14068: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_need_xopen_extension=yes
  else
-@@ -13058,11 +14009,11 @@
+@@ -13058,11 +14077,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:13061: result: $cf_cv_need_xopen_extension" >&5
-+echo "$as_me:14012: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:14080: result: $cf_cv_need_xopen_extension" >&5
  echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
  test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
  
 -echo "$as_me:13065: checking for term.h" >&5
-+echo "$as_me:14016: checking for term.h" >&5
++echo "$as_me:14084: 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
-@@ -13070,12 +14021,20 @@
+@@ -13070,12 +14089,20 @@
  
  # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
@@ -51841 +70781 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 13078 "configure"
-+#line 14037 "configure"
++#line 14105 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13089,16 +14048,16 @@
+@@ -13089,16 +14116,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13095: \$? = $ac_status" >&5
-+  echo "$as_me:14054: \$? = $ac_status" >&5
++  echo "$as_me:14122: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13101: \$? = $ac_status" >&5
-+  echo "$as_me:14060: \$? = $ac_status" >&5
++  echo "$as_me:14128: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_term_header=$cf_header
          break
-@@ -13117,7 +14076,7 @@
+@@ -13117,7 +14144,7 @@
         for cf_header in ncurses/term.h ncursesw/term.h
         do
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 13120 "configure"
-+#line 14079 "configure"
++#line 14147 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13135,16 +14094,16 @@
+@@ -13135,16 +14162,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13138: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14165: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13141: \$? = $ac_status" >&5
-+  echo "$as_me:14100: \$? = $ac_status" >&5
++  echo "$as_me:14168: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14171: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13147: \$? = $ac_status" >&5
-+  echo "$as_me:14106: \$? = $ac_status" >&5
++  echo "$as_me:14174: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_term_header=$cf_header
                          break
-@@ -13159,7 +14118,7 @@
+@@ -13159,7 +14186,7 @@
  esac
  
  fi
 -echo "$as_me:13162: result: $cf_cv_term_header" >&5
-+echo "$as_me:14121: result: $cf_cv_term_header" >&5
++echo "$as_me:14189: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  case $cf_cv_term_header in #(vi
-@@ -13183,7 +14142,96 @@
+@@ -13183,7 +14210,96 @@
         ;;
  esac
  
-+echo "$as_me:14145: checking for unctrl.h" >&5
++echo "$as_me:14213: checking for unctrl.h" >&5
 +echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 +if test "${cf_cv_unctrl_header+set}" = set; then
@@ -51930 +70870 @@
 +do
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 14166 "configure"
++#line 14234 "configure"
 +#include "confdefs.h"
 +
@@ -51944 +70884 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14183: \$? = $ac_status" >&5
++  echo "$as_me:14251: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14189: \$? = $ac_status" >&5
++  echo "$as_me:14257: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_unctrl_header=$cf_header
@@ -51967 +70907 @@
 +case $cf_cv_unctrl_header in #(vi
 +no)
-+       { echo "$as_me:14203: WARNING: unctrl.h header not found" >&5
++       { echo "$as_me:14271: WARNING: unctrl.h header not found" >&5
 +echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 +       ;;
@@ -51973 +70913 @@
 +
 +fi
-+echo "$as_me:14209: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:14277: result: $cf_cv_unctrl_header" >&5
 +echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 +
@@ -52002 +70942 @@
  color_set \
  filter \
-@@ -13210,8 +14258,10 @@
+@@ -13210,8 +14326,10 @@
  tigetstr \
  typeahead \
@@ -52014 +70954 @@
  winsstr \
  wresize \
-@@ -13221,10 +14271,94 @@
+@@ -13221,10 +14339,94 @@
  
  cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
  
 -       echo "$as_me:13224: checking for ${cf_func}" >&5
-+       echo "$as_me:14274: checking for ${cf_func}" >&5
++       echo "$as_me:14342: checking for ${cf_func}" >&5
 +echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 +
-+echo "${as_me:-configure}:14277: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:14345: testing ${cf_func} ..." 1>&5
 +
 +       if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
@@ -52031 +70971 @@
 +               if test ".$cf_result" != ".no"; then
 +                       cat >conftest.$ac_ext <<_ACEOF
-+#line 14286 "configure"
++#line 14354 "configure"
 +#include "confdefs.h"
 +
@@ -52063 +71003 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14386: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14321: \$? = $ac_status" >&5
++  echo "$as_me:14389: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14327: \$? = $ac_status" >&5
++  echo "$as_me:14395: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_result=yes
@@ -52088 +71028 @@
 +       # use the computed/retrieved cache-value:
 +       eval 'cf_result=$cf_cv_func_'$cf_func
-+       echo "$as_me:14343: result: $cf_result" >&5
++       echo "$as_me:14411: result: $cf_result" >&5
 +echo "${ECHO_T}$cf_result" >&6
 +       if test $cf_result != no; then
@@ -52103 +71043 @@
 +cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 +
-+       echo "$as_me:14358: checking for ${cf_func}" >&5
++       echo "$as_me:14426: checking for ${cf_func}" >&5
  echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
  
 -echo "${as_me:-configure}:13227: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14361: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:14429: testing ${cf_func} ..." 1>&5
  
         if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13233,7 +14367,7 @@
+@@ -13233,7 +14435,7 @@
                 eval cf_result='$ac_cv_func_'$cf_func
                 if test ".$cf_result" != ".no"; then
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 13236 "configure"
-+#line 14370 "configure"
++#line 14438 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -13256,7 +14390,8 @@
+@@ -13256,7 +14458,8 @@
  
  #ifndef ${cf_func}
@@ -52130 +71070 @@
  
    ;
-@@ -13264,16 +14399,16 @@
+@@ -13264,16 +14467,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13267: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14470: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13270: \$? = $ac_status" >&5
-+  echo "$as_me:14405: \$? = $ac_status" >&5
++  echo "$as_me:14473: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14476: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13276: \$? = $ac_status" >&5
-+  echo "$as_me:14411: \$? = $ac_status" >&5
++  echo "$as_me:14479: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -13289,7 +14424,7 @@
+@@ -13289,7 +14492,7 @@
  
         # use the computed/retrieved cache-value:
         eval 'cf_result=$cf_cv_func_'$cf_func
 -       echo "$as_me:13292: result: $cf_result" >&5
-+       echo "$as_me:14427: result: $cf_result" >&5
++       echo "$as_me:14495: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
         if test $cf_result != no; then
                 cat >>confdefs.h <<EOF
-@@ -13299,14 +14434,82 @@
+@@ -13299,14 +14502,82 @@
         fi
  done
@@ -52179 +71119 @@
 +                       fi
 +                       cat >conftest.$ac_ext <<_ACEOF
-+#line 14451 "configure"
++#line 14519 "configure"
 +#include "confdefs.h"
 +
@@ -52199 +71139 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14471: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14539: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14474: \$? = $ac_status" >&5
++  echo "$as_me:14542: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14477: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14545: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14480: \$? = $ac_status" >&5
++  echo "$as_me:14548: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
 +               test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 +
-+echo "${as_me:-configure}:14485: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:14553: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 +
 +               cat >>confdefs.h <<EOF
@@ -52233 +71173 @@
 +fi
 +
-+echo "$as_me:14505: checking for ncurses extended functions" >&5
++echo "$as_me:14573: 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
@@ -52241 +71181 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13309 "configure"
-+#line 14512 "configure"
++#line 14580 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13321,16 +14524,16 @@
+@@ -13321,16 +14592,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13324: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13327: \$? = $ac_status" >&5
-+  echo "$as_me:14530: \$? = $ac_status" >&5
++  echo "$as_me:14598: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13330: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14601: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13333: \$? = $ac_status" >&5
-+  echo "$as_me:14536: \$? = $ac_status" >&5
++  echo "$as_me:14604: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_ext_funcs=defined
  else
-@@ -13338,7 +14541,7 @@
+@@ -13338,7 +14609,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13341 "configure"
-+#line 14544 "configure"
++#line 14612 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13363,16 +14566,16 @@
+@@ -13363,16 +14634,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13366: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14569: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14637: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13369: \$? = $ac_status" >&5
-+  echo "$as_me:14572: \$? = $ac_status" >&5
++  echo "$as_me:14640: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14643: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13375: \$? = $ac_status" >&5
-+  echo "$as_me:14578: \$? = $ac_status" >&5
++  echo "$as_me:14646: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_ext_funcs=yes
  else
-@@ -13386,515 +14589,168 @@
+@@ -13386,515 +14657,168 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:13389: result: $cf_cv_ncurses_ext_funcs" >&5
-+echo "$as_me:14592: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:14660: 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
@@ -52319 +71259 @@
 +       then
 +               cf_define_xpg5=no
-+               echo "$as_me:14605: checking if _XPG5 should be defined to enable wide-characters" >&5
++               echo "$as_me:14673: 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
  
@@ -52325 +71265 @@
 -#line 13402 "configure"
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 14609 "configure"
++#line 14677 "configure"
  #include "confdefs.h"
  
@@ -52337 +71277 @@
 -       setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
 -
-+int x = _XPG5
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13419: \"$ac_link\"") >&5
@@ -52394 +71333 @@
 -#include <$ac_header>
 -_ACEOF
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13471: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14622: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:13474: \$? = $ac_status" >&5
-+  echo "$as_me:14625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13477: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
 -  echo "$as_me:13480: \$? = $ac_status" >&5
-+  echo "$as_me:14631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  (exit $ac_status); }; }; then
 -  eval "$as_ac_Header=yes"
-+  :
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
 -eval "$as_ac_Header=no"
 -fi
@@ -52436 +71370 @@
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line 13506 "configure"
-+cf_save_cppflags="$CPPFLAGS"
-+                        CPPFLAGS="$CPPFLAGS -D_XPG5"
-+                        cat >conftest.$ac_ext <<_ACEOF
-+#line 14640 "configure"
- #include "confdefs.h"
+-#include "confdefs.h"
 -$ac_includes_default
-+
-+#include <${cf_cv_ncurses_header:-curses.h}>
- int
- main ()
- {
+-int
+-main ()
+-{
 -if ((pid_t *) 0)
 -  return 0;
@@ -52458 +71386 @@
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13521: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14653: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14690: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13524: \$? = $ac_status" >&5
-+  echo "$as_me:14656: \$? = $ac_status" >&5
++  echo "$as_me:14693: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
++  { (eval echo "$as_me:14696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
 -  echo "$as_me:13530: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  echo "$as_me:14699: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
 -  ac_cv_type_pid_t=yes
 -else
@@ -52481 +71411 @@
 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 -if test $ac_cv_type_pid_t = yes; then
--  :
--else
+   :
+ else
 -
 -cat >>confdefs.h <<EOF
@@ -52522 +71452 @@
 -  eval "$as_ac_Header=yes"
 -else
--  echo "$as_me: failed program was:" >&5
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  eval "$as_ac_Header=no"
@@ -52548 +71478 @@
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line 13609 "configure"
--#include "confdefs.h"
++cat conftest.$ac_ext >&5
++cf_save_cppflags="$CPPFLAGS"
++                        CPPFLAGS="$CPPFLAGS -D_XPG5"
++                        cat >conftest.$ac_ext <<_ACEOF
++#line 14708 "configure"
+ #include "confdefs.h"
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.  */
@@ -52560 +71495 @@
 -char $ac_func ();
 -char (*f) ();
--
--int
--main ()
--{
+ 
++#include <${cf_cv_ncurses_header:-curses.h}>
+ int
+ main ()
+ {
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -52573 +71509 @@
 -#endif
 -
--  ;
--  return 0;
--}
--_ACEOF
++int x = _XPG5
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13640: \"$ac_link\"") >&5
@@ -52585 +71522 @@
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13646: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
 -  echo "$as_me:13649: \$? = $ac_status" >&5
-+  echo "$as_me:14662: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  (exit $ac_status); }; }; then
 -  eval "$as_ac_var=yes"
 -else
@@ -52636 +71571 @@
 -if { (eval echo "$as_me:13694: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
--  ac_status=$?
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:14721: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
 -  echo "$as_me:13697: \$? = $ac_status" >&5
 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:13699: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
++  echo "$as_me:14724: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:14727: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
 -  echo "$as_me:13702: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  echo "$as_me:14730: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
 -  ac_cv_func_fork_works=yes
 +  cf_define_xpg5=yes
@@ -52661 +71604 @@
 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 +rm -f conftest.$ac_objext conftest.$ac_ext
-+               echo "$as_me:14673: result: $cf_define_xpg5" >&5
++               echo "$as_me:14741: result: $cf_define_xpg5" >&5
 +echo "${ECHO_T}$cf_define_xpg5" >&6
  
@@ -52689 +71632 @@
 +       fi
 +
-+       echo "$as_me:14682: checking for wide-character functions" >&5
++       echo "$as_me:14750: 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
@@ -52701 +71644 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 14689 "configure"
++#line 14757 "configure"
  #include "confdefs.h"
 -/* Thanks to Paul Eggert for this test.  */
@@ -52747 +71690 @@
 -  pid_t parent = getpid ();
 -  pid_t child;
- 
+-
 -  sparc_address_test ();
+ 
+-  child = vfork ();
 +               static wchar_t src_wchar[2];
 +               static cchar_t dst_cchar;
 +               setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
  
--  child = vfork ();
--
 -  if (child == 0) {
 -    /* Here is another test for sparc vfork register problems.  This
@@ -52806 +71749 @@
 -if { (eval echo "$as_me:13839: \"$ac_link\"") >&5
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14706: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14774: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
@@ -52812 +71755 @@
 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:13844: \"$ac_try\"") >&5
-+  echo "$as_me:14709: \$? = $ac_status" >&5
++  echo "$as_me:14777: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14712: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14780: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13847: \$? = $ac_status" >&5
-+  echo "$as_me:14715: \$? = $ac_status" >&5
++  echo "$as_me:14783: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_func_vfork_works=yes
@@ -52849 +71792 @@
 -cat >>confdefs.h <<\EOF
 -#define HAVE_WORKING_VFORK 1
-+echo "$as_me:14726: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:14794: result: $cf_cv_widechar_funcs" >&5
 +echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 +       if test "$cf_cv_widechar_funcs" != no ; then
@@ -52879 +71822 @@
  
 -echo "$as_me:13890: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:14746: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:14814: 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
@@ -52887 +71830 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13897 "configure"
-+#line 14753 "configure"
++#line 14821 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -13914,16 +14770,16 @@
+@@ -13914,16 +14838,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14773: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14841: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13920: \$? = $ac_status" >&5
-+  echo "$as_me:14776: \$? = $ac_status" >&5
++  echo "$as_me:14844: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13923: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13926: \$? = $ac_status" >&5
-+  echo "$as_me:14782: \$? = $ac_status" >&5
++  echo "$as_me:14850: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sys_time_select=yes
  else
-@@ -13935,13 +14791,13 @@
+@@ -13935,13 +14859,13 @@
  
  fi
  
 -echo "$as_me:13938: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:14794: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:14862: 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
@@ -52924 +71867 @@
  
 -echo "$as_me:13944: checking for function curses_version" >&5
-+echo "$as_me:14800: checking for function curses_version" >&5
++echo "$as_me:14868: 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
-@@ -13951,7 +14807,7 @@
+@@ -13951,7 +14875,7 @@
    cf_cv_func_curses_version=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13954 "configure"
-+#line 14810 "configure"
++#line 14878 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13964,15 +14820,15 @@
+@@ -13964,15 +14888,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:13967: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14823: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13970: \$? = $ac_status" >&5
-+  echo "$as_me:14826: \$? = $ac_status" >&5
++  echo "$as_me:14894: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:13972: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14896: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13975: \$? = $ac_status" >&5
-+  echo "$as_me:14831: \$? = $ac_status" >&5
++  echo "$as_me:14899: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_curses_version=yes
  
-@@ -13987,13 +14843,13 @@
+@@ -13987,13 +14911,13 @@
  fi
  rm -f core
  fi
 -echo "$as_me:13990: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:14846: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:14914: 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
@@ -52969 +71912 @@
  
 -echo "$as_me:13996: checking for ncurses wrap-prefix" >&5
-+echo "$as_me:14852: checking for ncurses wrap-prefix" >&5
++echo "$as_me:14920: 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.
-@@ -14003,10 +14859,10 @@
+@@ -14003,10 +14927,10 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
 -echo "$as_me:14006: result: $NCURSES_WRAP_PREFIX" >&5
-+echo "$as_me:14862: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:14930: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  
 -echo "$as_me:14009: checking for alternate character set array" >&5
-+echo "$as_me:14865: checking for alternate character set array" >&5
++echo "$as_me:14933: 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
-@@ -14016,7 +14872,7 @@
+@@ -14016,7 +14940,7 @@
  for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14019 "configure"
-+#line 14875 "configure"
++#line 14943 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14032,16 +14888,16 @@
+@@ -14032,16 +14956,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14035: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14959: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14038: \$? = $ac_status" >&5
-+  echo "$as_me:14894: \$? = $ac_status" >&5
++  echo "$as_me:14962: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14041: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14965: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14044: \$? = $ac_status" >&5
-+  echo "$as_me:14900: \$? = $ac_status" >&5
++  echo "$as_me:14968: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_acs_map=$name; break
  else
-@@ -14052,14 +14908,16 @@
+@@ -14052,14 +14976,16 @@
  done
  
  fi
 -echo "$as_me:14055: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:14911: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:14979: result: $cf_cv_curses_acs_map" >&5
  echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
  
@@ -53031 +71974 @@
 +if test "$cf_enable_widec" = yes; then
 +
-+echo "$as_me:14920: checking for wide alternate character set array" >&5
++echo "$as_me:14988: 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
-@@ -14069,7 +14927,7 @@
+@@ -14069,7 +14995,7 @@
         for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
         do
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14072 "configure"
-+#line 14930 "configure"
++#line 14998 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14085,16 +14943,16 @@
+@@ -14085,16 +15011,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14088: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15014: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14091: \$? = $ac_status" >&5
-+  echo "$as_me:14949: \$? = $ac_status" >&5
++  echo "$as_me:15017: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15020: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14097: \$? = $ac_status" >&5
-+  echo "$as_me:14955: \$? = $ac_status" >&5
++  echo "$as_me:15023: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_wacs_map=$name
          break
-@@ -14105,14 +14963,14 @@
+@@ -14105,14 +15031,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         done
  fi
 -echo "$as_me:14108: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:14966: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:15034: result: $cf_cv_curses_wacs_map" >&5
  echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
  
@@ -53078 +72021 @@
  
 -echo "$as_me:14115: checking for wide alternate character constants" >&5
-+echo "$as_me:14973: checking for wide alternate character constants" >&5
++echo "$as_me:15041: 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
-@@ -14122,7 +14980,7 @@
+@@ -14122,7 +15048,7 @@
  if test "$cf_cv_curses_wacs_map" != unknown
  then
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14125 "configure"
-+#line 14983 "configure"
++#line 15051 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14139,16 +14997,16 @@
+@@ -14139,16 +15065,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14142: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15068: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14145: \$? = $ac_status" >&5
-+  echo "$as_me:15003: \$? = $ac_status" >&5
++  echo "$as_me:15071: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14148: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15074: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14151: \$? = $ac_status" >&5
-+  echo "$as_me:15009: \$? = $ac_status" >&5
++  echo "$as_me:15077: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_wacs_symbols=yes
  else
-@@ -14158,7 +15016,7 @@
+@@ -14158,7 +15084,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  else
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14161 "configure"
-+#line 15019 "configure"
++#line 15087 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14174,16 +15032,16 @@
+@@ -14174,16 +15100,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14177: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15103: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14180: \$? = $ac_status" >&5
-+  echo "$as_me:15038: \$? = $ac_status" >&5
++  echo "$as_me:15106: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14183: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14186: \$? = $ac_status" >&5
-+  echo "$as_me:15044: \$? = $ac_status" >&5
++  echo "$as_me:15112: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_curses_wacs_symbols=yes
  else
-@@ -14194,17 +15052,19 @@
+@@ -14194,17 +15120,19 @@
  fi
  
  fi
 -echo "$as_me:14197: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:15055: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:15123: result: $cf_cv_curses_wacs_symbols" >&5
  echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
  
@@ -53157 +72100 @@
 +fi
 +
-+echo "$as_me:15064: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15132: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14207 "configure"
-+#line 15067 "configure"
++#line 15135 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14222,16 +15082,16 @@
+@@ -14222,16 +15150,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14225: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15085: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14228: \$? = $ac_status" >&5
-+  echo "$as_me:15088: \$? = $ac_status" >&5
++  echo "$as_me:15156: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14231: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15159: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14234: \$? = $ac_status" >&5
-+  echo "$as_me:15094: \$? = $ac_status" >&5
++  echo "$as_me:15162: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14240,7 +15100,7 @@
+@@ -14240,7 +15168,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14243: result: $cf_result" >&5
-+echo "$as_me:15103: result: $cf_result" >&5
++echo "$as_me:15171: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -14257,15 +15117,17 @@
+@@ -14257,15 +15185,17 @@
  
  fi
@@ -53203 +72146 @@
  # This is needed on Tru64 5.0 to declare mbstate_t
 -echo "$as_me:14261: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:15123: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:15191: 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
@@ -53211 +72154 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14268 "configure"
-+#line 15130 "configure"
++#line 15198 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -14283,23 +15145,23 @@
+@@ -14283,23 +15213,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15216: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14289: \$? = $ac_status" >&5
-+  echo "$as_me:15151: \$? = $ac_status" >&5
++  echo "$as_me:15219: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15222: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14295: \$? = $ac_status" >&5
-+  echo "$as_me:15157: \$? = $ac_status" >&5
++  echo "$as_me:15225: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=no
@@ -53240 +72183 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14302 "configure"
-+#line 15164 "configure"
++#line 15232 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -14318,16 +15180,16 @@
+@@ -14318,16 +15248,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14321: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15183: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15251: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14324: \$? = $ac_status" >&5
-+  echo "$as_me:15186: \$? = $ac_status" >&5
++  echo "$as_me:15254: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14327: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15257: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14330: \$? = $ac_status" >&5
-+  echo "$as_me:15192: \$? = $ac_status" >&5
++  echo "$as_me:15260: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=yes
  else
-@@ -14339,7 +15201,7 @@
+@@ -14339,7 +15269,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:14342: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:15204: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:15272: result: $cf_cv_mbstate_t" >&5
  echo "${ECHO_T}$cf_cv_mbstate_t" >&6
  
  if test "$cf_cv_mbstate_t" = yes ; then
-@@ -14361,14 +15223,14 @@
+@@ -14361,14 +15291,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wchar_t
 -echo "$as_me:14364: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:15226: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:15294: 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
@@ -53287 +72230 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14371 "configure"
-+#line 15233 "configure"
++#line 15301 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -14386,23 +15248,23 @@
+@@ -14386,23 +15316,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14389: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15319: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14392: \$? = $ac_status" >&5
-+  echo "$as_me:15254: \$? = $ac_status" >&5
++  echo "$as_me:15322: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15325: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14398: \$? = $ac_status" >&5
-+  echo "$as_me:15260: \$? = $ac_status" >&5
++  echo "$as_me:15328: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=no
@@ -53316 +72259 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14405 "configure"
-+#line 15267 "configure"
++#line 15335 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -14421,16 +15283,16 @@
+@@ -14421,16 +15351,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14424: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14427: \$? = $ac_status" >&5
-+  echo "$as_me:15289: \$? = $ac_status" >&5
++  echo "$as_me:15357: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14430: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14433: \$? = $ac_status" >&5
-+  echo "$as_me:15295: \$? = $ac_status" >&5
++  echo "$as_me:15363: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=yes
  else
-@@ -14442,7 +15304,7 @@
+@@ -14442,7 +15372,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:14445: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:15307: result: $cf_cv_wchar_t" >&5
++echo "$as_me:15375: result: $cf_cv_wchar_t" >&5
  echo "${ECHO_T}$cf_cv_wchar_t" >&6
  
  if test "$cf_cv_wchar_t" = yes ; then
-@@ -14464,14 +15326,14 @@
+@@ -14464,14 +15394,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wint_t
 -echo "$as_me:14467: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:15329: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:15397: 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
@@ -53363 +72306 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14474 "configure"
-+#line 15336 "configure"
++#line 15404 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -14489,23 +15351,23 @@
+@@ -14489,23 +15419,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15422: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14495: \$? = $ac_status" >&5
-+  echo "$as_me:15357: \$? = $ac_status" >&5
++  echo "$as_me:15425: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15428: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14501: \$? = $ac_status" >&5
-+  echo "$as_me:15363: \$? = $ac_status" >&5
++  echo "$as_me:15431: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=no
@@ -53392 +72335 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14508 "configure"
-+#line 15370 "configure"
++#line 15438 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -14524,16 +15386,16 @@
+@@ -14524,16 +15454,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14527: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15457: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14530: \$? = $ac_status" >&5
-+  echo "$as_me:15392: \$? = $ac_status" >&5
++  echo "$as_me:15460: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14533: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15463: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14536: \$? = $ac_status" >&5
-+  echo "$as_me:15398: \$? = $ac_status" >&5
++  echo "$as_me:15466: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=yes
  else
-@@ -14545,7 +15407,7 @@
+@@ -14545,7 +15475,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:14548: result: $cf_cv_wint_t" >&5
-+echo "$as_me:15410: result: $cf_cv_wint_t" >&5
++echo "$as_me:15478: result: $cf_cv_wint_t" >&5
  echo "${ECHO_T}$cf_cv_wint_t" >&6
  
  if test "$cf_cv_wint_t" = yes ; then
-@@ -14566,12 +15428,12 @@
+@@ -14566,12 +15496,12 @@
         NCURSES_OK_WINT_T=1
  fi
@@ -53434 +72377 @@
  
 -echo "$as_me:14571: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15433: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15501: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14574 "configure"
-+#line 15436 "configure"
++#line 15504 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14589,16 +15451,16 @@
+@@ -14589,16 +15519,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14592: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15522: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14595: \$? = $ac_status" >&5
-+  echo "$as_me:15457: \$? = $ac_status" >&5
++  echo "$as_me:15525: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15528: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14601: \$? = $ac_status" >&5
-+  echo "$as_me:15463: \$? = $ac_status" >&5
++  echo "$as_me:15531: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14607,7 +15469,7 @@
+@@ -14607,7 +15537,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14610: result: $cf_result" >&5
-+echo "$as_me:15472: result: $cf_result" >&5
++echo "$as_me:15540: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -14624,14 +15486,14 @@
+@@ -14624,14 +15554,14 @@
  
  fi
@@ -53483 +72426 @@
  
 -echo "$as_me:14631: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15493: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15561: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14634 "configure"
-+#line 15496 "configure"
++#line 15564 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14649,16 +15511,16 @@
+@@ -14649,16 +15579,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15582: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14655: \$? = $ac_status" >&5
-+  echo "$as_me:15517: \$? = $ac_status" >&5
++  echo "$as_me:15585: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15588: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14661: \$? = $ac_status" >&5
-+  echo "$as_me:15523: \$? = $ac_status" >&5
++  echo "$as_me:15591: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14667,7 +15529,7 @@
+@@ -14667,7 +15597,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14670: result: $cf_result" >&5
-+echo "$as_me:15532: result: $cf_result" >&5
++echo "$as_me:15600: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -14684,14 +15546,14 @@
+@@ -14684,14 +15614,14 @@
  
  fi
@@ -53532 +72475 @@
  
 -echo "$as_me:14691: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15553: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15621: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14694 "configure"
-+#line 15556 "configure"
++#line 15624 "configure"
  #include "confdefs.h"
  
  #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14709,16 +15571,16 @@
+@@ -14709,16 +15639,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15574: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15642: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14715: \$? = $ac_status" >&5
-+  echo "$as_me:15577: \$? = $ac_status" >&5
++  echo "$as_me:15645: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14718: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15648: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14721: \$? = $ac_status" >&5
-+  echo "$as_me:15583: \$? = $ac_status" >&5
++  echo "$as_me:15651: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14727,7 +15589,7 @@
+@@ -14727,7 +15657,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14730: result: $cf_result" >&5
-+echo "$as_me:15592: result: $cf_result" >&5
++echo "$as_me:15660: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  if test $cf_result = yes ; then
  
-@@ -14744,13 +15606,14 @@
+@@ -14744,13 +15674,14 @@
  
  fi
@@ -53578 +72521 @@
  
 -echo "$as_me:14749: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15612: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15680: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14753 "configure"
-+#line 15616 "configure"
++#line 15684 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -14778,16 +15641,16 @@
+@@ -14778,16 +15709,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14781: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15712: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14784: \$? = $ac_status" >&5
-+  echo "$as_me:15647: \$? = $ac_status" >&5
++  echo "$as_me:15715: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14787: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15718: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14790: \$? = $ac_status" >&5
-+  echo "$as_me:15653: \$? = $ac_status" >&5
++  echo "$as_me:15721: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14796,7 +15659,7 @@
+@@ -14796,7 +15727,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14799: result: $cf_result" >&5
-+echo "$as_me:15662: result: $cf_result" >&5
++echo "$as_me:15730: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test $cf_result = yes ; then
-@@ -14808,14 +15671,14 @@
+@@ -14808,14 +15739,14 @@
  EOF
  
  else
 -       echo "$as_me:14811: checking for data boolnames in library" >&5
-+       echo "$as_me:15674: checking for data boolnames in library" >&5
++       echo "$as_me:15742: checking for data boolnames in library" >&5
  echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
         # BSD linkers insist on making weak linkage, but resolve at runtime.
@@ -53630 +72573 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14818 "configure"
-+#line 15681 "configure"
++#line 15749 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -14847,16 +15710,16 @@
+@@ -14847,16 +15778,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14850: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15713: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15781: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14853: \$? = $ac_status" >&5
-+  echo "$as_me:15716: \$? = $ac_status" >&5
++  echo "$as_me:15784: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14856: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15787: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14859: \$? = $ac_status" >&5
-+  echo "$as_me:15722: \$? = $ac_status" >&5
++  echo "$as_me:15790: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14868,7 +15731,7 @@
+@@ -14868,7 +15799,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14871 "configure"
-+#line 15734 "configure"
++#line 15802 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -14893,15 +15756,15 @@
+@@ -14893,15 +15824,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14896: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15827: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14899: \$? = $ac_status" >&5
-+  echo "$as_me:15762: \$? = $ac_status" >&5
++  echo "$as_me:15830: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15832: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14904: \$? = $ac_status" >&5
-+  echo "$as_me:15767: \$? = $ac_status" >&5
++  echo "$as_me:15835: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14912,7 +15775,7 @@
+@@ -14912,7 +15843,7 @@
  fi
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
 -       echo "$as_me:14915: result: $cf_result" >&5
-+       echo "$as_me:15778: result: $cf_result" >&5
++       echo "$as_me:15846: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
         if test $cf_result = yes ; then
  
-@@ -14925,11 +15788,11 @@
+@@ -14925,11 +15856,11 @@
         fi
  fi
  
 -echo "$as_me:14928: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15791: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15859: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
  echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14932 "configure"
-+#line 15795 "configure"
++#line 15863 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -14957,16 +15820,16 @@
+@@ -14957,16 +15888,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15823: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15891: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14963: \$? = $ac_status" >&5
-+  echo "$as_me:15826: \$? = $ac_status" >&5
++  echo "$as_me:15894: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15829: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15897: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14969: \$? = $ac_status" >&5
-+  echo "$as_me:15832: \$? = $ac_status" >&5
++  echo "$as_me:15900: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -14975,7 +15838,7 @@
+@@ -14975,7 +15906,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14978: result: $cf_result" >&5
-+echo "$as_me:15841: result: $cf_result" >&5
++echo "$as_me:15909: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
  if test $cf_result = yes ; then
-@@ -14987,14 +15850,14 @@
+@@ -14987,14 +15918,14 @@
  EOF
  
  else
 -       echo "$as_me:14990: checking for data boolfnames in library" >&5
-+       echo "$as_me:15853: checking for data boolfnames in library" >&5
++       echo "$as_me:15921: checking for data boolfnames in library" >&5
  echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
         # BSD linkers insist on making weak linkage, but resolve at runtime.
@@ -53750 +72693 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14997 "configure"
-+#line 15860 "configure"
++#line 15928 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -15026,16 +15889,16 @@
+@@ -15026,16 +15957,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15029: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15960: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15032: \$? = $ac_status" >&5
-+  echo "$as_me:15895: \$? = $ac_status" >&5
++  echo "$as_me:15963: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15035: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15966: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15038: \$? = $ac_status" >&5
-+  echo "$as_me:15901: \$? = $ac_status" >&5
++  echo "$as_me:15969: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15047,7 +15910,7 @@
+@@ -15047,7 +15978,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15050 "configure"
-+#line 15913 "configure"
++#line 15981 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_XCURSES
-@@ -15072,15 +15935,15 @@
+@@ -15072,15 +16003,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15075: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15938: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16006: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15078: \$? = $ac_status" >&5
-+  echo "$as_me:15941: \$? = $ac_status" >&5
++  echo "$as_me:16009: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15080: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16011: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15083: \$? = $ac_status" >&5
-+  echo "$as_me:15946: \$? = $ac_status" >&5
++  echo "$as_me:16014: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -15091,7 +15954,7 @@
+@@ -15091,7 +16022,7 @@
  fi
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
 -       echo "$as_me:15094: result: $cf_result" >&5
-+       echo "$as_me:15957: result: $cf_result" >&5
++       echo "$as_me:16025: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
         if test $cf_result = yes ; then
  
-@@ -15104,6 +15967,335 @@
+@@ -15104,6 +16035,335 @@
         fi
  fi
  
 +LD_RPATH_OPT=
-+echo "$as_me:15971: checking for an rpath option" >&5
++echo "$as_me:16039: checking for an rpath option" >&5
 +echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 +case $cf_cv_system_name in #(vi
@@ -53849 +72792 @@
 +       ;;
 +esac
-+echo "$as_me:16002: result: $LD_RPATH_OPT" >&5
++echo "$as_me:16070: result: $LD_RPATH_OPT" >&5
 +echo "${ECHO_T}$LD_RPATH_OPT" >&6
 +
 +case "x$LD_RPATH_OPT" in #(vi
 +x-R*)
-+       echo "$as_me:16007: checking if we need a space after rpath option" >&5
++       echo "$as_me:16075: checking if we need a space after rpath option" >&5
 +echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 +       cf_save_LIBS="$LIBS"
 +       LIBS="${LD_RPATH_OPT}$libdir $LIBS"
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 16012 "configure"
++#line 16080 "configure"
 +#include "confdefs.h"
 +
@@ -53871 +72814 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:16024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16092: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16027: \$? = $ac_status" >&5
++  echo "$as_me:16095: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:16030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16098: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16033: \$? = $ac_status" >&5
++  echo "$as_me:16101: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_rpath_space=no
@@ -53890 +72833 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +       LIBS="$cf_save_LIBS"
-+       echo "$as_me:16043: result: $cf_rpath_space" >&5
++       echo "$as_me:16111: result: $cf_rpath_space" >&5
 +echo "${ECHO_T}$cf_rpath_space" >&6
 +       test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
@@ -53896 +72839 @@
 +esac
 +
-+echo "$as_me:16049: checking if rpath-hack should be disabled" >&5
++echo "$as_me:16117: checking if rpath-hack should be disabled" >&5
 +echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 +
@@ -53913 +72856 @@
 +
 +fi;
-+echo "$as_me:16066: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:16134: result: $cf_disable_rpath_hack" >&5
 +echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 +if test "$cf_disable_rpath_hack" = no ; then
 +
-+echo "$as_me:16070: checking for updated LDFLAGS" >&5
++echo "$as_me:16138: checking for updated LDFLAGS" >&5
 +echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 +if test -n "$LD_RPATH_OPT" ; then
-+       echo "$as_me:16073: result: maybe" >&5
++       echo "$as_me:16141: result: maybe" >&5
 +echo "${ECHO_T}maybe" >&6
 +
@@ -53927 +72870 @@
 +  # 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:16080: checking for $ac_word" >&5
++echo "$as_me:16148: 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
@@ -53942 +72885 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_cf_ldd_prog="$ac_prog"
-+echo "$as_me:16095: found $ac_dir/$ac_word" >&5
++echo "$as_me:16163: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -53950 +72893 @@
 +cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 +if test -n "$cf_ldd_prog"; then
-+  echo "$as_me:16103: result: $cf_ldd_prog" >&5
++  echo "$as_me:16171: result: $cf_ldd_prog" >&5
 +echo "${ECHO_T}$cf_ldd_prog" >&6
 +else
-+  echo "$as_me:16106: result: no" >&5
++  echo "$as_me:16174: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -53967 +72910 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 16120 "configure"
++#line 16188 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -53979 +72922 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:16132: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16135: \$? = $ac_status" >&5
++  echo "$as_me:16203: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:16138: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16141: \$? = $ac_status" >&5
++  echo "$as_me:16209: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
@@ -54016 +72959 @@
 +                                               test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 +
-+echo "${as_me:-configure}:16169: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:16237: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 +
 +                                               LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
@@ -54028 +72971 @@
 +       test -n "$verbose" && echo "    ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 +
-+echo "${as_me:-configure}:16181: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16249: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 +
 +test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 +
-+echo "${as_me:-configure}:16185: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16253: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 +
 +cf_rpath_dst=
@@ -54069 +73012 @@
 +                               test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 +
-+echo "${as_me:-configure}:16222: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:16290: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 +
 +                               EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
@@ -54082 +73025 @@
 +test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
 +
-+echo "${as_me:-configure}:16235: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16303: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 +
 +test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
 +
-+echo "${as_me:-configure}:16239: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:16307: testing ...checking LIBS $LIBS ..." 1>&5
 +
 +cf_rpath_dst=
@@ -54123 +73066 @@
 +                               test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 +
-+echo "${as_me:-configure}:16276: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:16344: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 +
 +                               EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
@@ -54136 +73079 @@
 +test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
 +
-+echo "${as_me:-configure}:16289: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:16357: testing ...checked LIBS $LIBS ..." 1>&5
 +
 +       test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 +
-+echo "${as_me:-configure}:16293: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16361: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 +
 +fi
@@ -54149 +73092 @@
  LIBS=
  
-@@ -15188,7 +16380,7 @@
+@@ -15188,7 +16448,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ echo "$as_me:15191: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:16383: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:16451: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -15364,7 +16556,7 @@
+@@ -15320,7 +16580,7 @@
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20101002,
++configured by $0, generated by GNU Autoconf 2.52.20120811,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -15364,7 +16624,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
 -    { { echo "$as_me:15367: error: ambiguous option: $1
-+    { { echo "$as_me:16559: error: ambiguous option: $1
++    { { echo "$as_me:16627: 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;}
-@@ -15383,7 +16575,7 @@
+@@ -15383,7 +16643,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
 -  -*) { { echo "$as_me:15386: error: unrecognized option: $1
-+  -*) { { echo "$as_me:16578: error: unrecognized option: $1
++  -*) { { echo "$as_me:16646: 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;}
-@@ -15431,7 +16623,7 @@
+@@ -15402,7 +16662,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20101002, executed with
++This file was extended by $as_me 2.52.20120811, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -15419,7 +16679,9 @@
+ #
+ 
+ AWK="$AWK"
++ECHO_CC="$ECHO_CC"
+ ECHO_LD="$ECHO_LD"
++SHOW_CC="$SHOW_LD"
+ 
+ EOF
+ 
+@@ -15431,7 +16693,7 @@
    "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:15434: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:16626: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:16696: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -15541,6 +16733,7 @@
+@@ -15490,6 +16752,7 @@
+ s,@bindir@,$bindir,;t t
+ s,@sbindir@,$sbindir,;t t
+ s,@libexecdir@,$libexecdir,;t t
++s,@datarootdir@,$datarootdir,;t t
+ s,@datadir@,$datadir,;t t
+ s,@sysconfdir@,$sysconfdir,;t t
+ s,@sharedstatedir@,$sharedstatedir,;t t
+@@ -15541,6 +16804,7 @@
  s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
  s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
@@ -54193 +73172 @@
  s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
  s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
-@@ -15561,7 +16754,8 @@
+@@ -15561,7 +16825,8 @@
  s,@TEST_ARGS@,$TEST_ARGS,;t t
  s,@TEST_DEPS@,$TEST_DEPS,;t t
@@ -54203 +73182 @@
  s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t
  s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
-@@ -15572,6 +16766,7 @@
+@@ -15572,6 +16837,7 @@
  s,@ECHO_CC@,$ECHO_CC,;t t
  s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
@@ -54211 +73190 @@
  s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
  s,@X_CFLAGS@,$X_CFLAGS,;t t
-@@ -15579,7 +16774,10 @@
+@@ -15579,7 +16845,10 @@
  s,@X_LIBS@,$X_LIBS,;t t
  s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
@@ -54222 +73201 @@
  
  EOF
-@@ -15694,7 +16892,7 @@
+@@ -15694,7 +16963,7 @@
    esac
  
    if test x"$ac_file" != x-; then
 -    { echo "$as_me:15697: creating $ac_file" >&5
-+    { echo "$as_me:16895: creating $ac_file" >&5
++    { echo "$as_me:16966: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -15712,7 +16910,7 @@
+@@ -15712,7 +16981,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:15715: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:16913: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:16984: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -15725,7 +16923,7 @@
+@@ -15725,7 +16994,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:15728: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:16926: error: cannot find input file: $f" >&5
++           { { echo "$as_me:16997: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -15791,7 +16989,7 @@
+@@ -15791,7 +17060,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
 -  test x"$ac_file" != x- && { echo "$as_me:15794: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:16992: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:17063: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -15802,7 +17000,7 @@
+@@ -15802,7 +17071,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:15805: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:17003: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:17074: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -15815,7 +17013,7 @@
+@@ -15815,7 +17084,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:15818: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:17016: error: cannot find input file: $f" >&5
++           { { echo "$as_me:17087: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -15873,7 +17071,7 @@
+@@ -15873,7 +17142,7 @@
    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:15876: $ac_file is unchanged" >&5
-+      { echo "$as_me:17074: $ac_file is unchanged" >&5
++      { echo "$as_me:17145: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -15949,7 +17218,8 @@
+ \$(MODEL)/$N.o : \$(srcdir)/$N.c \\
+        \$(srcdir)/test.priv.h \\
+        ncurses_cfg.h
+-       @echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
++       $SHOW_CC
++       $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
+ TEST_EOF
+ done
+ 
 diff -Naur ncurses-5.9.orig/test/configure.in ncurses-5.9/test/configure.in
---- ncurses-5.9.orig/test/configure.in  2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/configure.in       2012-02-16 18:25:13.215824712 +0000
+--- ncurses-5.9.orig/test/configure.in  2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/configure.in       2012-08-25 19:58:01.046559827 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -54300 +73289 @@
  dnl
 -dnl $Id: configure.in,v 1.90 2011/03/22 09:15:08 tom Exp $
-+dnl $Id: configure.in,v 1.103 2012/01/21 23:55:49 tom Exp $
++dnl $Id: configure.in,v 1.104 2012/03/17 17:29:03 tom Exp $
  dnl This is a simple configuration-script for the ncurses test programs that
  dnl allows the test-directory to be separately configured against a reference
@@ -54539 +73528 @@
  LIBS=
  
+@@ -302,7 +333,8 @@
+ \$(MODEL)/$N.o : \$(srcdir)/$N.c \\
+        \$(srcdir)/test.priv.h \\
+        ncurses_cfg.h
+-       @echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
++       $SHOW_CC
++       $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
+ TEST_EOF
+ done
+ 
+@@ -317,5 +349,7 @@
+ fi
+ ],[
+ AWK="$AWK"
++ECHO_CC="$ECHO_CC"
+ ECHO_LD="$ECHO_LD"
++SHOW_CC="$SHOW_LD"
+ ],cat)
+diff -Naur ncurses-5.9.orig/test/demo_forms.c ncurses-5.9/test/demo_forms.c
+--- ncurses-5.9.orig/test/demo_forms.c  2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/demo_forms.c       2012-08-25 19:58:01.779889693 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2003-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2003-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.38 2011/01/15 18:15:11 tom Exp $
++ * $Id: demo_forms.c,v 1.39 2012/06/09 20:30:32 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+@@ -108,7 +108,7 @@
+        set_field_just(f, j_value);
+        if (d_option) {
+            if (has_colors()) {
+-               set_field_fore(f, COLOR_PAIR(2));
++               set_field_fore(f, (chtype) COLOR_PAIR(2));
+                set_field_back(f, A_UNDERLINE | COLOR_PAIR(3));
+            } else {
+                set_field_fore(f, A_BOLD);
+@@ -257,7 +257,7 @@
+     int currow, curcol;
+ 
+     if (has_colors()) {
+-       wbkgd(win, COLOR_PAIR(1));
++       wbkgd(win, (chtype) COLOR_PAIR(1));
+     }
+     werase(win);
+     form_getyx(form, currow, curcol);
+@@ -309,15 +309,15 @@
+        }
+ 
+        waddch(win, ' ');
+-       (void) wattrset(win, field_fore(field));
++       (void) wattrset(win, (int) field_fore(field));
+        waddstr(win, "fore");
+-       wattroff(win, field_fore(field));
++       wattroff(win, (int) field_fore(field));
+ 
+        waddch(win, '/');
+ 
+-       (void) wattrset(win, field_back(field));
++       (void) wattrset(win, (int) field_back(field));
+        waddstr(win, "back");
+-       wattroff(win, field_back(field));
++       wattroff(win, (int) field_back(field));
+ 
+        wprintw(win, ", pad '%c'",
+                field_pad(field));
+@@ -531,7 +531,7 @@
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+        init_pair(2, COLOR_GREEN, COLOR_BLACK);
+        init_pair(3, COLOR_CYAN, COLOR_BLACK);
+-       bkgd(COLOR_PAIR(1));
++       bkgd((chtype) COLOR_PAIR(1));
+        refresh();
+     }
+ 
+@@ -540,6 +540,7 @@
+     endwin();
+     ExitProgram(EXIT_SUCCESS);
+ }
++
+ #else
+ int
+ main(void)
 diff -Naur ncurses-5.9.orig/test/demo_menus.c ncurses-5.9/test/demo_menus.c
---- ncurses-5.9.orig/test/demo_menus.c  2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/demo_menus.c       2012-02-16 18:25:13.155823127 +0000
+--- ncurses-5.9.orig/test/demo_menus.c  2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/demo_menus.c       2012-08-25 19:58:01.783223010 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -54554 +73635 @@
  /*
 - * $Id: demo_menus.c,v 1.32 2011/01/15 20:02:47 tom Exp $
-+ * $Id: demo_menus.c,v 1.33 2012/01/14 17:20:39 tom Exp $
++ * $Id: demo_menus.c,v 1.34 2012/06/09 20:30:33 tom Exp $
   *
   * Demonstrate a variety of functions from the menu library.
   * Thomas Dickey - 2005/4/9
+@@ -225,8 +225,8 @@
+     result = new_menu(items);
+ 
+     if (has_colors()) {
+-       set_menu_fore(result, COLOR_PAIR(1));
+-       set_menu_back(result, COLOR_PAIR(2));
++       set_menu_fore(result, (chtype) COLOR_PAIR(1));
++       set_menu_back(result, (chtype) COLOR_PAIR(2));
+     }
+ 
+     set_menu_format(result, maxrow, maxcol);
 @@ -831,7 +831,7 @@
  {
@@ -54567 +73659 @@
         ,"Options:"
  #if HAVE_RIPOFFLINE
+diff -Naur ncurses-5.9.orig/test/demo_termcap.c ncurses-5.9/test/demo_termcap.c
+--- ncurses-5.9.orig/test/demo_termcap.c        2012-08-25 19:57:59.406567583 +0000
++++ ncurses-5.9/test/demo_termcap.c     2012-08-25 19:58:01.896555808 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2005-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 2005-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.14 2011/01/15 21:41:27 tom Exp $
++ * $Id: demo_termcap.c,v 1.22 2012/07/07 23:37:27 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -50,11 +50,112 @@
+ #if USE_CODE_LISTS
+ static bool b_opt = FALSE;
+ static bool n_opt = FALSE;
++static bool q_opt = FALSE;
+ static bool s_opt = FALSE;
+ #endif
+ 
++static char *d_opt;
++static char *e_opt;
++static char **db_list;
++static int db_item;
++
++static long total_values;
++
+ #define isCapName(c) (isgraph(c) && strchr("^#=:\\", c) == 0)
+ 
++#if NO_LEAKS && USE_CODE_LISTS
++
++#define MYSCR struct _myscr
++MYSCR {
++    MYSCR *next;
++    TERMINAL *term;
++};
++
++static MYSCR *my_screens;
++
++static void
++save_screen(void)
++{
++    MYSCR *obj = malloc(sizeof(MYSCR));
++    obj->next = my_screens;
++    obj->term = cur_term;
++    my_screens = obj;
++}
++#else
++#define save_screen()          /* nothing */
++#endif
++
++static char *
++make_dbitem(char *p, char *q)
++{
++    char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q));
++    sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q);
++    return result;
++}
++
++static void
++make_dblist(void)
++{
++    if (d_opt && e_opt) {
++       int pass;
++
++       for (pass = 0; pass < 2; ++pass) {
++           char *p, *q;
++           size_t count = 0;
++
++           for (p = q = d_opt; *p != '\0'; ++p) {
++               if (*p == ':') {
++                   if (p != q + 1) {
++                       if (pass) {
++                           db_list[count] = make_dbitem(p, q);
++                       }
++                       count++;
++                   }
++                   q = p + 1;
++               }
++           }
++           if (p != q + 1) {
++               if (pass) {
++                   db_list[count] = make_dbitem(p, q);
++               }
++               count++;
++           }
++           if (!pass) {
++               db_list = typeCalloc(char *, count + 1);
++           }
++       }
++    }
++}
++
++static char *
++next_dbitem(void)
++{
++    char *result = 0;
++
++    if (db_list) {
++       if ((result = db_list[db_item]) == 0) {
++           db_item = 0;
++           result = db_list[0];
++       } else {
++           db_item++;
++       }
++    }
++    printf("** %s\n", result);
++    return result;
++}
++
++static void
++free_dblist(void)
++{
++    if (db_list) {
++       int n;
++       for (n = 0; db_list[n]; ++n)
++           free(db_list[n]);
++       free(db_list);
++       db_list = 0;
++    }
++}
++
+ static void
+ dumpit(NCURSES_CONST char *cap)
+ {
+@@ -70,66 +171,77 @@
+     int num;
+ 
+     if ((str = tgetstr(cap, &ap)) != 0) {
+-       /*
+-        * Note that the strings returned are mostly terminfo format, since
+-        * ncurses does not convert except for a handful of special cases.
+-        */
+-       printf(FNAME(str), cap);
+-       while (*str != 0) {
+-           int ch = UChar(*str++);
+-           switch (ch) {
+-           case '\177':
+-               fputs("^?", stdout);
+-               break;
+-           case '\033':
+-               fputs("\\E", stdout);
+-               break;
+-           case '\b':
+-               fputs("\\b", stdout);
+-               break;
+-           case '\f':
+-               fputs("\\f", stdout);
+-               break;
+-           case '\n':
+-               fputs("\\n", stdout);
+-               break;
+-           case '\r':
+-               fputs("\\r", stdout);
+-               break;
+-           case ' ':
+-               fputs("\\s", stdout);
+-               break;
+-           case '\t':
+-               fputs("\\t", stdout);
+-               break;
+-           case '^':
+-               fputs("\\^", stdout);
+-               break;
+-           case ':':
+-               fputs("\\072", stdout);
+-               break;
+-           case '\\':
+-               fputs("\\\\", stdout);
+-               break;
+-           default:
+-               if (isgraph(ch))
+-                   fputc(ch, stdout);
+-               else if (ch < 32)
+-                   printf("^%c", ch + '@');
+-               else
+-                   printf("\\%03o", ch);
+-               break;
++       total_values++;
++       if (!q_opt) {
++           /*
++            * Note that the strings returned are mostly terminfo format, since
++            * ncurses does not convert except for a handful of special cases.
++            */
++           printf(FNAME(str), cap);
++           while (*str != 0) {
++               int ch = UChar(*str++);
++               switch (ch) {
++               case '\177':
++                   fputs("^?", stdout);
++                   break;
++               case '\033':
++                   fputs("\\E", stdout);
++                   break;
++               case '\b':
++                   fputs("\\b", stdout);
++                   break;
++               case '\f':
++                   fputs("\\f", stdout);
++                   break;
++               case '\n':
++                   fputs("\\n", stdout);
++                   break;
++               case '\r':
++                   fputs("\\r", stdout);
++                   break;
++               case ' ':
++                   fputs("\\s", stdout);
++                   break;
++               case '\t':
++                   fputs("\\t", stdout);
++                   break;
++               case '^':
++                   fputs("\\^", stdout);
++                   break;
++               case ':':
++                   fputs("\\072", stdout);
++                   break;
++               case '\\':
++                   fputs("\\\\", stdout);
++                   break;
++               default:
++                   if (isgraph(ch))
++                       fputc(ch, stdout);
++                   else if (ch < 32)
++                       printf("^%c", ch + '@');
++                   else
++                       printf("\\%03o", ch);
++                   break;
++               }
+            }
++           printf("\n");
+        }
+-       printf("\n");
+     } else if ((num = tgetnum(cap)) >= 0) {
+-       printf(FNAME(num), cap);
+-       printf(" %d\n", num);
++       total_values++;
++       if (!q_opt) {
++           printf(FNAME(num), cap);
++           printf(" %d\n", num);
++       }
+     } else if (tgetflag(cap) > 0) {
+-       printf(FNAME(flg), cap);
+-       printf("%s\n", "true");
++       ++total_values;
++       if (!q_opt) {
++           printf(FNAME(flg), cap);
++           printf("%s\n", "true");
++       }
+     }
+-    fflush(stdout);
++
++    if (!q_opt)
++       fflush(stdout);
+ }
+ 
+ static void
+@@ -137,6 +249,9 @@
+ {
+     char buffer[1024];
+ 
++    if (db_list) {
++       putenv(next_dbitem());
++    }
+     printf("Terminal type %s\n", name);
+     if (tgetent(buffer, name) >= 0) {
+        char cap[3];
+@@ -159,17 +274,21 @@
+ 
+ #if USE_CODE_LISTS
+ static void
+-demo_terminfo(NCURSES_CONST char *name)
++demo_termcap(NCURSES_CONST char *name)
+ {
+     unsigned n;
+     NCURSES_CONST char *cap;
+ 
++    if (db_list) {
++       putenv(next_dbitem());
++    }
+     printf("Terminal type \"%s\"\n", name);
+ #if HAVE_SETUPTERM
+     setupterm(name, 1, (int *) 0);
+ #else
+     setterm(name);
+ #endif
++    save_screen();
+ 
+     if (b_opt) {
+        for (n = 0;; ++n) {
+@@ -204,7 +323,7 @@
+ {
+     static const char *msg[] =
+     {
+-       "Usage: demo_terminfo [options] [terminal]",
++       "Usage: demo_termcap [options] [terminal]",
+        "",
+        "If no options are given, print all (boolean, numeric, string)",
+        "capabilities for the given terminal, using short names.",
+@@ -212,7 +331,10 @@
+        "Options:",
+        " -a       try all names, print capabilities found",
+        " -b       print boolean-capabilities",
++       " -d LIST  colon-separated list of databases to use",
++       " -e NAME  environment variable to set with -d option",
+        " -n       print numeric-capabilities",
++       " -q       quiet (prints only counts)",
+        " -r COUNT repeat for given count",
+        " -s       print string-capabilities",
+     };
+@@ -235,7 +357,7 @@
+     int repeat;
+     int r_opt = 1;
+ 
+-    while ((n = getopt(argc, argv, "abnr:s")) != -1) {
++    while ((n = getopt(argc, argv, "abd:e:nqr:s")) != -1) {
+        switch (n) {
+        case 'a':
+            a_opt = TRUE;
+@@ -243,9 +365,18 @@
+        case 'b':
+            b_opt = TRUE;
+            break;
++       case 'd':
++           d_opt = optarg;
++           break;
++       case 'e':
++           e_opt = optarg;
++           break;
+        case 'n':
+            n_opt = TRUE;
+            break;
++       case 'q':
++           q_opt = TRUE;
++           break;
+        case 'r':
+            if ((r_opt = atoi(optarg)) <= 0)
+                usage();
+@@ -268,6 +399,8 @@
+     a_opt = TRUE;
+ #endif
+ 
++    make_dblist();
++
+     if (a_opt) {
+        if (optind < argc) {
+            for (n = optind; n < argc; ++n) {
+@@ -285,17 +418,35 @@
+        for (repeat = 0; repeat < r_opt; ++repeat) {
+            if (optind < argc) {
+                for (n = optind; n < argc; ++n) {
+-                   demo_terminfo(argv[n]);
++                   demo_termcap(argv[n]);
+                }
+            } else if ((name = getenv("TERM")) != 0) {
+-               demo_terminfo(name);
++               demo_termcap(name);
+            } else {
+                static char dumb[] = "dumb";
+-               demo_terminfo(dumb);
++               demo_termcap(dumb);
+            }
+        }
+-    }
++#if NO_LEAKS
++       /*
++        * ncurses' tgetent() interface caches some entries and its no-leaks
++        * code discards those.  The calls to setupterm() on the other hand
++        * are not cached, and each call allocates a chunk of memory, even
++        * if the same terminal type is requested repeatedly.
++        */
++       while (my_screens != 0) {
++           MYSCR *next = my_screens->next;
++           del_curterm(my_screens->term);
++           free(my_screens);
++           my_screens = next;
++       }
+ #endif
++    }
++#endif /* USE_CODE_LISTS */
++
++    printf("%ld values\n", total_values);
++
++    free_dblist();
+ 
+     ExitProgram(EXIT_SUCCESS);
+ }
+@@ -306,6 +457,6 @@
+      char *argv[]GCC_UNUSED)
+ {
+     printf("This program requires termcap\n");
+-    exit(EXIT_FAILURE);
++    ExitProgram(EXIT_FAILURE);
+ }
+ #endif
+diff -Naur ncurses-5.9.orig/test/demo_terminfo.c ncurses-5.9/test/demo_terminfo.c
+--- ncurses-5.9.orig/test/demo_terminfo.c       2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/demo_terminfo.c    2012-08-25 19:58:01.896555808 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_terminfo.c,v 1.9 2010/11/28 00:15:27 tom Exp $
++ * $Id: demo_terminfo.c,v 1.13 2012/07/07 23:37:13 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -52,12 +52,90 @@
+ static bool b_opt = FALSE;
+ static bool f_opt = FALSE;
+ static bool n_opt = FALSE;
++static bool q_opt = FALSE;
+ static bool s_opt = FALSE;
+ static bool x_opt = FALSE;
+ 
++static char *d_opt;
++static char *e_opt;
++static char **db_list;
++static int db_item;
++
++static long total_values;
++
+ #define FCOLS 8
+ #define FNAME(type) "%s %-*s = ", #type, FCOLS
+ 
++static char *
++make_dbitem(char *p, char *q)
++{
++    char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q));
++    sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q);
++    return result;
++}
++
++static void
++make_dblist(void)
++{
++    if (d_opt && e_opt) {
++       int pass;
++
++       for (pass = 0; pass < 2; ++pass) {
++           char *p, *q;
++           size_t count = 0;
++
++           for (p = q = d_opt; *p != '\0'; ++p) {
++               if (*p == ':') {
++                   if (p != q + 1) {
++                       if (pass) {
++                           db_list[count] = make_dbitem(p, q);
++                       }
++                       count++;
++                   }
++                   q = p + 1;
++               }
++           }
++           if (p != q + 1) {
++               if (pass) {
++                   db_list[count] = make_dbitem(p, q);
++               }
++               count++;
++           }
++           if (!pass) {
++               db_list = typeCalloc(char *, count + 1);
++           }
++       }
++    }
++}
++
++static char *
++next_dbitem(void)
++{
++    char *result = 0;
++
++    if (db_list) {
++       if ((result = db_list[db_item]) == 0) {
++           db_item = 0;
++           result = db_list[0];
++       } else {
++           db_item++;
++       }
++    }
++    printf("** %s\n", result);
++    return result;
++}
++
++static void
++free_dblist(void)
++{
++    if (db_list) {
++       int n;
++       for (n = 0; db_list[n]; ++n)
++           free(db_list[n]);
++       free(db_list);
++       db_list = 0;
++    }
++}
+ static void
+ dumpit(NCURSES_CONST char *cap)
+ {
+@@ -72,66 +150,77 @@
+     int num;
+ 
+     if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) {
+-       /*
+-        * Note that the strings returned are mostly terminfo format, since
+-        * ncurses does not convert except for a handful of special cases.
+-        */
+-       printf(FNAME(str), cap);
+-       while (*str != 0) {
+-           int ch = UChar(*str++);
+-           switch (ch) {
+-           case '\177':
+-               fputs("^?", stdout);
+-               break;
+-           case '\033':
+-               fputs("\\E", stdout);
+-               break;
+-           case '\b':
+-               fputs("\\b", stdout);
+-               break;
+-           case '\f':
+-               fputs("\\f", stdout);
+-               break;
+-           case '\n':
+-               fputs("\\n", stdout);
+-               break;
+-           case '\r':
+-               fputs("\\r", stdout);
+-               break;
+-           case ' ':
+-               fputs("\\s", stdout);
+-               break;
+-           case '\t':
+-               fputs("\\t", stdout);
+-               break;
+-           case '^':
+-               fputs("\\^", stdout);
+-               break;
+-           case ':':
+-               fputs("\\072", stdout);
+-               break;
+-           case '\\':
+-               fputs("\\\\", stdout);
+-               break;
+-           default:
+-               if (isgraph(ch))
+-                   fputc(ch, stdout);
+-               else if (ch < 32)
+-                   printf("^%c", ch + '@');
+-               else
+-                   printf("\\%03o", ch);
+-               break;
++       total_values++;
++       if (!q_opt) {
++           /*
++            * Note that the strings returned are mostly terminfo format, since
++            * ncurses does not convert except for a handful of special cases.
++            */
++           printf(FNAME(str), cap);
++           while (*str != 0) {
++               int ch = UChar(*str++);
++               switch (ch) {
++               case '\177':
++                   fputs("^?", stdout);
++                   break;
++               case '\033':
++                   fputs("\\E", stdout);
++                   break;
++               case '\b':
++                   fputs("\\b", stdout);
++                   break;
++               case '\f':
++                   fputs("\\f", stdout);
++                   break;
++               case '\n':
++                   fputs("\\n", stdout);
++                   break;
++               case '\r':
++                   fputs("\\r", stdout);
++                   break;
++               case ' ':
++                   fputs("\\s", stdout);
++                   break;
++               case '\t':
++                   fputs("\\t", stdout);
++                   break;
++               case '^':
++                   fputs("\\^", stdout);
++                   break;
++               case ':':
++                   fputs("\\072", stdout);
++                   break;
++               case '\\':
++                   fputs("\\\\", stdout);
++                   break;
++               default:
++                   if (isgraph(ch))
++                       fputc(ch, stdout);
++                   else if (ch < 32)
++                       printf("^%c", ch + '@');
++                   else
++                       printf("\\%03o", ch);
++                   break;
++               }
+            }
++           printf("\n");
+        }
+-       printf("\n");
+     } else if ((num = tigetnum(cap)) >= 0) {
+-       printf(FNAME(num), cap);
+-       printf(" %d\n", num);
++       total_values++;
++       if (!q_opt) {
++           printf(FNAME(num), cap);
++           printf(" %d\n", num);
++       }
+     } else if ((num = tigetflag(cap)) >= 0) {
+-       printf(FNAME(flg), cap);
+-       printf("%s\n", num ? "true" : "false");
++       total_values++;
++       if (!q_opt) {
++           printf(FNAME(flg), cap);
++           printf("%s\n", num ? "true" : "false");
++       }
+     }
+-    fflush(stdout);
++
++    if (!q_opt)
++       fflush(stdout);
+ }
+ 
+ static void
+@@ -140,6 +229,9 @@
+     unsigned n;
+     NCURSES_CONST char *cap;
+ 
++    if (db_list) {
++       putenv(next_dbitem());
++    }
+     printf("Terminal type \"%s\"\n", name);
+     setupterm(name, 1, (int *) 0);
+ 
+@@ -224,8 +316,11 @@
+        "",
+        "Options:",
+        " -b       print boolean-capabilities",
++       " -d LIST  colon-separated list of databases to use",
++       " -e NAME  environment variable to set with -d option",
+        " -f       print full names",
+        " -n       print numeric-capabilities",
++       " -q       quiet (prints only counts)",
+        " -r COUNT repeat for given count",
+        " -s       print string-capabilities",
+ #ifdef NCURSES_VERSION
+@@ -247,17 +342,26 @@
+     char *name;
+     int r_opt = 1;
+ 
+-    while ((n = getopt(argc, argv, "bfnr:sx")) != -1) {
++    while ((n = getopt(argc, argv, "bd:e:fnqr:sx")) != -1) {
+        switch (n) {
+        case 'b':
+            b_opt = TRUE;
+            break;
++       case 'd':
++           d_opt = optarg;
++           break;
++       case 'e':
++           e_opt = optarg;
++           break;
+        case 'f':
+            f_opt = TRUE;
+            break;
+        case 'n':
+            n_opt = TRUE;
+            break;
++       case 'q':
++           q_opt = TRUE;
++           break;
+        case 'r':
+            if ((r_opt = atoi(optarg)) <= 0)
+                usage();
+@@ -283,6 +387,8 @@
+        s_opt = TRUE;
+     }
+ 
++    make_dblist();
++
+     for (repeat = 0; repeat < r_opt; ++repeat) {
+        if (optind < argc) {
+            for (n = optind; n < argc; ++n) {
+@@ -296,6 +402,10 @@
+        }
+     }
+ 
++    printf("%ld values\n", total_values);
++
++    free_dblist();
++
+     ExitProgram(EXIT_SUCCESS);
+ }
+ 
 diff -Naur ncurses-5.9.orig/test/ditto.c ncurses-5.9/test/ditto.c
---- ncurses-5.9.orig/test/ditto.c       2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/ditto.c    2012-02-16 18:25:13.031819857 +0000
+--- ncurses-5.9.orig/test/ditto.c       2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/ditto.c    2012-08-25 19:58:00.086564367 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -54597 +74405 @@
  {
 diff -Naur ncurses-5.9.orig/test/dots.c ncurses-5.9/test/dots.c
---- ncurses-5.9.orig/test/dots.c        2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/dots.c     2012-02-16 18:25:13.031819857 +0000
+--- ncurses-5.9.orig/test/dots.c        2012-08-25 19:57:59.406567583 +0000
++++ ncurses-5.9/test/dots.c     2012-08-25 19:58:00.086564367 +0000
 @@ -29,7 +29,7 @@
  /*
@@ -54629 +74437 @@
  static bool
 diff -Naur ncurses-5.9.orig/test/dots_mvcur.c ncurses-5.9/test/dots_mvcur.c
---- ncurses-5.9.orig/test/dots_mvcur.c  2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/dots_mvcur.c       2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/dots_mvcur.c  2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/dots_mvcur.c       2012-08-25 19:58:00.086564367 +0000
 @@ -29,7 +29,7 @@
  /*
@@ -54660 +74468 @@
  
  static bool
+diff -Naur ncurses-5.9.orig/test/echochar.c ncurses-5.9/test/echochar.c
+--- ncurses-5.9.orig/test/echochar.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/echochar.c 2012-08-25 19:58:01.783223010 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2006-2008,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: echochar.c,v 1.8 2010/11/14 01:00:44 tom Exp $
++ * $Id: echochar.c,v 1.9 2012/06/09 20:30:32 tom Exp $
+  *
+  * Demonstrate the echochar function (compare to dots.c).
+  * Thomas Dickey - 2006/11/4
+@@ -74,7 +74,7 @@
+                  (short) fg,
+                  (short) bg);
+     }
+-    attron(COLOR_PAIR(pair));
++    attron((attr_t) COLOR_PAIR(pair));
+ }
+ 
+ int
 diff -Naur ncurses-5.9.orig/test/filter.c ncurses-5.9/test/filter.c
---- ncurses-5.9.orig/test/filter.c      2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/filter.c   2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/filter.c      2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/filter.c   2012-08-25 19:58:01.783223010 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -54675 +74511 @@
   *
 - * $Id: filter.c,v 1.13 2010/11/13 20:55:54 tom Exp $
-+ * $Id: filter.c,v 1.14 2011/04/23 20:13:32 tom Exp $
++ * $Id: filter.c,v 1.15 2012/06/09 20:30:32 tom Exp $
   */
  #include <test.priv.h>
  
+@@ -133,7 +133,7 @@
+            background = -1;
+ #endif
+        init_pair(1, COLOR_CYAN, (short) background);
+-       underline = COLOR_PAIR(1);
++       underline = (attr_t) COLOR_PAIR(1);
+     } else {
+        underline = A_UNDERLINE;
+     }
 @@ -143,7 +143,7 @@
         reset_shell_mode();
@@ -54688 +74533 @@
         touchwin(stdscr);
         erase();
+diff -Naur ncurses-5.9.orig/test/gdc.c ncurses-5.9/test/gdc.c
+--- ncurses-5.9.orig/test/gdc.c 2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/gdc.c      2012-08-25 19:58:01.786556327 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -33,7 +33,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.34 2010/11/13 21:01:23 tom Exp $
++ * $Id: gdc.c,v 1.35 2012/06/09 20:30:32 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -78,7 +78,7 @@
+     int n;
+ 
+     if (hascolor)
+-       (void) attrset(COLOR_PAIR(PAIR_FRAMES));
++       (void) attrset((attr_t) COLOR_PAIR(PAIR_FRAMES));
+ 
+     MvAddCh(YBASE - 1, XBASE - 1, ACS_ULCORNER);
+     hline(ACS_HLINE, XLENGTH);
+@@ -102,7 +102,7 @@
+     vline(ACS_VLINE, YDEPTH);
+ 
+     if (hascolor)
+-       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
++       (void) attrset((attr_t) COLOR_PAIR(PAIR_OTHERS));
+ }
+ 
+ static void
+@@ -110,13 +110,13 @@
+ {
+     if (on) {
+        if (hascolor) {
+-           attron(COLOR_PAIR(PAIR_DIGITS));
++           attron((attr_t) COLOR_PAIR(PAIR_DIGITS));
+        } else {
+            attron(A_STANDOUT);
+        }
+     } else {
+        if (hascolor) {
+-           attron(COLOR_PAIR(PAIR_OTHERS));
++           attron((attr_t) COLOR_PAIR(PAIR_OTHERS));
+        } else {
+            attroff(A_STANDOUT);
+        }
+@@ -220,7 +220,7 @@
+        init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED);
+        init_pair(PAIR_OTHERS, COLOR_RED, bg);
+        init_pair(PAIR_FRAMES, COLOR_WHITE, bg);
+-       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
++       (void) attrset((attr_t) COLOR_PAIR(PAIR_OTHERS));
+     }
+ 
+   restart:
+diff -Naur ncurses-5.9.orig/test/hanoi.c ncurses-5.9/test/hanoi.c
+--- ncurses-5.9.orig/test/hanoi.c       2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/hanoi.c    2012-08-25 19:58:01.786556327 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -41,7 +41,7 @@
+  *
+  *     Date: 05.Nov.90
+  *
+- * $Id: hanoi.c,v 1.31 2010/11/14 01:01:07 tom Exp $
++ * $Id: hanoi.c,v 1.32 2012/06/09 20:30:32 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -57,7 +57,7 @@
+ #define MIDPEG                 39
+ #define RIGHTPEG               59
+ 
+-#define LENTOIND(x)            (((x)-1)/2)
++#define LENTOIND(x)            (((int)(x)-1)/2)
+ #define OTHER(a,b)             (3-((a)+(b)))
+ 
+ struct Peg {
+@@ -255,7 +255,7 @@
+                memset(TileBuf, ' ', len);
+                TileBuf[len] = '\0';
+                if (has_colors())
+-                   (void) attrset(COLOR_PAIR(LENTOIND(len)));
++                   (void) attrset((attr_t) COLOR_PAIR(LENTOIND(len)));
+                else
+                    (void) attrset(A_REVERSE);
+                MvAddStr(BASELINE - (SlotNo + 1),
 diff -Naur ncurses-5.9.orig/test/ins_wide.c ncurses-5.9/test/ins_wide.c
---- ncurses-5.9.orig/test/ins_wide.c    2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/ins_wide.c 2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/ins_wide.c    2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/ins_wide.c 2012-08-25 19:58:01.786556327 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -26,7 +26,7 @@
   * authorization.                                                           *
@@ -54696 +74647 @@
  /*
 - * $Id: ins_wide.c,v 1.15 2010/12/12 00:20:14 tom Exp $
-+ * $Id: ins_wide.c,v 1.16 2011/12/10 19:54:43 tom Exp $
++ * $Id: ins_wide.c,v 1.17 2012/06/09 20:29:33 tom Exp $
   *
   * Demonstrate the wins_wstr() and wins_wch functions.
@@ -54712 +74663 @@
      if (first) {
         static char cmd[80];
+@@ -281,7 +282,7 @@
+     if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-       wbkgdset(work, COLOR_PAIR(1) | ' ');
++       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));
+     }
+ 
+     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
+diff -Naur ncurses-5.9.orig/test/insdelln.c ncurses-5.9/test/insdelln.c
+--- ncurses-5.9.orig/test/insdelln.c    2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/insdelln.c 2012-08-25 19:58:01.789889645 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: insdelln.c,v 1.5 2010/11/13 23:39:38 tom Exp $
++ * $Id: insdelln.c,v 1.6 2012/06/09 20:29:33 tom Exp $
+  *
+  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
+  */
+@@ -300,7 +300,7 @@
+     init_status(win, &st);
+ 
+     do {
+-       (void) wattrset(win, st.attr | (attr_t) COLOR_PAIR(st.pair));
++       (void) wattrset(win, (int) (st.attr | (attr_t) COLOR_PAIR(st.pair)));
+        switch (st.ch) {
+        case 'i':
+            for (n = 0; n < st.count; ++n)
+diff -Naur ncurses-5.9.orig/test/inserts.c ncurses-5.9/test/inserts.c
+--- ncurses-5.9.orig/test/inserts.c     2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/inserts.c  2012-08-25 19:58:01.789889645 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
++ * Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inserts.c,v 1.23 2010/12/12 00:19:55 tom Exp $
++ * $Id: inserts.c,v 1.24 2012/06/09 20:29:33 tom Exp $
+  *
+  * Demonstrate the winsstr() and winsch functions.
+  * Thomas Dickey - 2002/10/19
+@@ -207,7 +207,7 @@
+     if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-       wbkgdset(work, COLOR_PAIR(1) | ' ');
++       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));
+     }
+ 
+     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
 diff -Naur ncurses-5.9.orig/test/movewindow.c ncurses-5.9/test/movewindow.c
---- ncurses-5.9.orig/test/movewindow.c  2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/movewindow.c       2012-02-16 18:25:13.243825451 +0000
+--- ncurses-5.9.orig/test/movewindow.c  2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/movewindow.c       2012-08-25 19:58:01.793222963 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -54727 +74743 @@
  /*
 - * $Id: movewindow.c,v 1.24 2010/11/13 23:34:55 tom Exp $
-+ * $Id: movewindow.c,v 1.34 2012/02/05 01:16:47 tom Exp $
++ * $Id: movewindow.c,v 1.35 2012/06/09 20:30:32 tom Exp $
   *
   * Demonstrate move functions for windows and derived windows from the curses
@@ -55003 +75019 @@
 +    for (y = 0; y < y1; ++y) {
 +       for (x = 0; x < x1; ++x) {
-+           MvWAddCh(win, y, x, ch);
++           MvWAddCh(win, y, x, (chtype) ch);
 +           if (++ch > 'z')
 +               ch = 'a';
@@ -55083 +75099 @@
             continue;
 diff -Naur ncurses-5.9.orig/test/ncurses.c ncurses-5.9/test/ncurses.c
---- ncurses-5.9.orig/test/ncurses.c     2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/ncurses.c  2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/ncurses.c     2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/ncurses.c  2012-08-25 19:58:02.029888511 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -40,7 +40,7 @@
     Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
@@ -55090 +75113 @@
  
 -$Id: ncurses.c,v 1.365 2011/01/22 19:48:33 tom Exp $
-+$Id: ncurses.c,v 1.370 2011/09/17 21:57:49 tom Exp $
++$Id: ncurses.c,v 1.373 2012/07/21 17:40:21 tom Exp $
  
  ***************************************************************************/
@@ -55103 +75126 @@
      if (message)
         addstr("returned from shellout.\n");
-@@ -777,7 +777,7 @@
+@@ -777,12 +777,21 @@
      }
      doupdate();
@@ -55112 +75135 @@
  #define forget_boxes()         /* nothing */
  #define remember_boxes(level,text,frame)       /* nothing */
-@@ -1394,7 +1394,7 @@
+ #endif
+ 
++/*
++ * Return-code is OK/ERR or a keyname.
++ */
++static const char *
++ok_keyname(int code)
++{
++    return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code)));
++}
++
+ static void
+ wgetch_test(unsigned level, WINDOW *win, int delay)
+ {
+@@ -824,9 +833,11 @@
+        } else if (c == 'g') {
+            waddstr(win, "getstr test: ");
+            echo();
+-           wgetnstr(win, buf, sizeof(buf) - 1);
++           c = wgetnstr(win, buf, sizeof(buf) - 1);
+            noecho();
+-           wprintw(win, "I saw %d characters:\n\t`%s'.", (int) strlen(buf), buf);
++           wprintw(win, "I saw %d characters:\n\t`%s' (%s).",
++                   (int) strlen(buf), buf,
++                   ok_keyname(c));
+            wclrtoeol(win);
+            wgetch_wrap(win, first_y);
+        } else if (c == 'k') {
+@@ -1394,7 +1405,7 @@
         if (!(termattrs() & test)) {
             printw(" (N/A)");
@@ -55121 +75172 @@
                 {
                     A_STANDOUT,
-@@ -1675,8 +1675,8 @@
+@@ -1675,8 +1686,8 @@
             add_wch(&ch);
         }
@@ -55132 +75183 @@
         (void) attr_get(&old_attr, &old_pair, 0);
         (void) attr_set(attr, pair, 0);
-@@ -3360,6 +3360,7 @@
+@@ -2972,7 +2983,7 @@
+ #endif
+        default:
+            if (cycle_attr(c, &at_code, &attr)) {
+-               slk_attr_set(attr, (fg || bg), NULL);
++               slk_attr_set(attr, (short) (fg || bg), NULL);
+                slk_touch();
+                slk_noutrefresh();
+                break;
+@@ -3360,6 +3371,7 @@
              * The repeat-count may make text wrap - avoid that.
              */
@@ -55140 +75200 @@
                 break;
         } while (--count > 0);
-@@ -4269,8 +4270,10 @@
+@@ -4269,8 +4281,10 @@
  
                     neww->next = current ? current->next : 0;
@@ -55153 +75213 @@
                     neww->wind = getwin(fp);
  
-@@ -6772,7 +6775,7 @@
+@@ -5226,7 +5240,7 @@
+ #ifdef A_COLOR
+     if (use_colors) {
+        init_pair(2, COLOR_CYAN, COLOR_BLUE);
+-       wbkgd(subWin, COLOR_PAIR(2) | ' ');
++       wbkgd(subWin, (chtype) (COLOR_PAIR(2) | ' '));
+     }
+ #endif
+     (void) wattrset(subWin, A_BOLD);
+@@ -6056,11 +6070,11 @@
+        break;
+     case 2:
+        init_pair(cpair, COLOR_BLUE, COLOR_WHITE);
+-       (void) wattrset(win, (attr_t) COLOR_PAIR(cpair) | A_NORMAL);
++       (void) wattrset(win, (int) (COLOR_PAIR(cpair) | A_NORMAL));
+        break;
+     case 3:
+        init_pair(cpair, COLOR_WHITE, COLOR_BLUE);
+-       (void) wattrset(win, (attr_t) COLOR_PAIR(cpair) | A_BOLD);
++       (void) wattrset(win, (int) (COLOR_PAIR(cpair) | A_BOLD));
+        break;
+     }
+ }
+@@ -6483,6 +6497,7 @@
+        ,"  -a f,b   set default-colors (assumed white-on-black)"
+        ,"  -d       use default-colors if terminal supports them"
+ #endif
++       ,"  -E       call use_env(FALSE) to ignore $LINES and $COLUMNS"
+ #if USE_SOFTKEYS
+        ,"  -e fmt   specify format for soft-keys test (e)"
+ #endif
+@@ -6495,6 +6510,9 @@
+ #if USE_LIBPANEL
+        ,"  -s msec  specify nominal time for panel-demo (default: 1, to hold)"
+ #endif
++#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714)
++       ,"  -T       call use_tioctl(TRUE) to allow SIGWINCH to override environment"
++#endif
+ #ifdef TRACE
+        ,"  -t mask  specify default trace-level (may toggle with ^T)"
+ #endif
+@@ -6681,7 +6699,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) {
++    while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:")) != -1) {
+        switch (c) {
+ #ifdef NCURSES_VERSION
+        case 'a':
+@@ -6692,6 +6710,9 @@
+            default_colors = TRUE;
+            break;
+ #endif
++       case 'E':
++           use_env(FALSE);
++           break;
+        case 'e':
+            my_e_param = atoi(optarg);
+ #ifdef NCURSES_VERSION
+@@ -6721,6 +6742,11 @@
+            nap_msec = (int) atol(optarg);
+            break;
+ #endif
++#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714)
++       case 'T':
++           use_tioctl(TRUE);
++           break;
++#endif
+ #ifdef TRACE
+        case 't':
+            save_trace = (unsigned) strtol(optarg, 0, 0);
+@@ -6772,7 +6798,7 @@
             use_default_colors();
             min_colors = -1;
@@ -55162 +75294 @@
             assume_default_colors(default_fg, default_bg);
  #endif
+diff -Naur ncurses-5.9.orig/test/newdemo.c ncurses-5.9/test/newdemo.c
+--- ncurses-5.9.orig/test/newdemo.c     2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/newdemo.c  2012-08-25 19:58:01.799889599 +0000
+@@ -2,7 +2,7 @@
+  *  newdemo.c  -       A demo program using PDCurses. The program illustrate
+  *                     the use of colours for text output.
+  *
+- * $Id: newdemo.c,v 1.35 2010/12/12 00:19:15 tom Exp $
++ * $Id: newdemo.c,v 1.36 2012/06/09 19:17:29 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -84,7 +84,7 @@
+        if (pair > COLOR_PAIRS)
+            pair = COLOR_PAIRS;
+        init_pair((short) pair, (short) foreground, (short) background);
+-       (void) wattrset(win, (attr_t) COLOR_PAIR(pair));
++       (void) wattrset(win, (int) COLOR_PAIR(pair));
+     }
+ }
+ 
+@@ -96,7 +96,7 @@
+            pair = COLOR_PAIRS;
+        attrs |= (chtype) COLOR_PAIR(pair);
+     }
+-    (void) wattrset(win, attrs);
++    (void) wattrset(win, (int) attrs);
+     return attrs;
+ }
+ 
 diff -Naur ncurses-5.9.orig/test/railroad.c ncurses-5.9/test/railroad.c
---- ncurses-5.9.orig/test/railroad.c    2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/railroad.c 2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/railroad.c    2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/railroad.c 2012-08-25 19:58:00.089897685 +0000
 @@ -29,7 +29,7 @@
  /*
@@ -55195 +75357 @@
  static void
 diff -Naur ncurses-5.9.orig/test/rain.c ncurses-5.9/test/rain.c
---- ncurses-5.9.orig/test/rain.c        2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/rain.c     2012-02-16 18:25:13.215824712 +0000
+--- ncurses-5.9.orig/test/rain.c        2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/rain.c     2012-08-25 19:58:00.506562380 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -55232 +75394 @@
   * waiting when we want a thread past that limit.
 diff -Naur ncurses-5.9.orig/test/redraw.c ncurses-5.9/test/redraw.c
---- ncurses-5.9.orig/test/redraw.c      2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/redraw.c   2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/redraw.c      2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/redraw.c   2012-08-25 19:58:00.089897685 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -55268 +75430 @@
             break;
  #endif
+diff -Naur ncurses-5.9.orig/test/tclock.c ncurses-5.9/test/tclock.c
+--- ncurses-5.9.orig/test/tclock.c      2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/tclock.c   2012-08-25 19:58:01.799889599 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: tclock.c,v 1.30 2011/03/22 09:16:00 tom Exp $ */
++/* $Id: tclock.c,v 1.31 2012/06/09 19:17:02 tom Exp $ */
+ 
+ #include <test.priv.h>
+ 
+@@ -216,12 +216,12 @@
+        attroff(A_REVERSE);
+ 
+        if (has_colors())
+-           (void) attrset(COLOR_PAIR(1));
++           (void) attrset((attr_t) COLOR_PAIR(1));
+ 
+        dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
+ 
+        if (has_colors())
+-           (void) attrset(COLOR_PAIR(0));
++           (void) attrset((attr_t) COLOR_PAIR(0));
+ 
+        text = ctime(&tim);
+        MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
 diff -Naur ncurses-5.9.orig/test/test.priv.h ncurses-5.9/test/test.priv.h
---- ncurses-5.9.orig/test/test.priv.h   2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/test.priv.h        2012-02-16 18:25:13.035819963 +0000
+--- ncurses-5.9.orig/test/test.priv.h   2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/test.priv.h        2012-08-25 19:58:00.089897685 +0000
 @@ -29,7 +29,7 @@
  /****************************************************************************
@@ -55433 +75619 @@
  #define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w)
  #define USING_WINDOW2(w,func,data) use_window(w, (NCURSES_WINDOW_CB) func, data)
+diff -Naur ncurses-5.9.orig/test/test_add_wchstr.c ncurses-5.9/test/test_add_wchstr.c
+--- ncurses-5.9.orig/test/test_add_wchstr.c     2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/test_add_wchstr.c  2012-08-25 19:58:01.803222916 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2009,2010,2011 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2010,2011,2012 Free Software Foundation, Inc.                   *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_add_wchstr.c,v 1.15 2011/01/15 18:15:11 tom Exp $
++ * $Id: test_add_wchstr.c,v 1.16 2012/06/09 20:29:33 tom Exp $
+  *
+  * Demonstrate the waddwchstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -357,7 +357,7 @@
+     if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-       wbkgdset(work, COLOR_PAIR(1) | ' ');
++       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));
+     }
+ 
+     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
+diff -Naur ncurses-5.9.orig/test/test_addchstr.c ncurses-5.9/test/test_addchstr.c
+--- ncurses-5.9.orig/test/test_addchstr.c       2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/test_addchstr.c    2012-08-25 19:58:01.803222916 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addchstr.c,v 1.13 2010/12/12 01:28:24 tom Exp $
++ * $Id: test_addchstr.c,v 1.14 2012/06/09 20:29:33 tom Exp $
+  *
+  * Demonstrate the waddchstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -277,7 +277,7 @@
+     if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-       show_attr = COLOR_PAIR(1);
++       show_attr = (attr_t) COLOR_PAIR(1);
+        wbkgdset(work, show_attr | ' ');
+     } else {
+        show_attr = A_STANDOUT;
+diff -Naur ncurses-5.9.orig/test/test_addstr.c ncurses-5.9/test/test_addstr.c
+--- ncurses-5.9.orig/test/test_addstr.c 2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/test_addstr.c      2012-08-25 19:58:01.803222916 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addstr.c,v 1.6 2010/12/12 00:17:37 tom Exp $
++ * $Id: test_addstr.c,v 1.7 2012/06/09 20:29:33 tom Exp $
+  *
+  * Demonstrate the waddstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -201,7 +201,7 @@
+     if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-       wbkgdset(work, COLOR_PAIR(1) | ' ');
++       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));
+     }
+ 
+     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
 diff -Naur ncurses-5.9.orig/test/test_addwstr.c ncurses-5.9/test/test_addwstr.c
---- ncurses-5.9.orig/test/test_addwstr.c        2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/test_addwstr.c     2012-02-16 18:25:13.039820069 +0000
+--- ncurses-5.9.orig/test/test_addwstr.c        2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/test_addwstr.c     2012-08-25 19:58:01.803222916 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
 @@ -26,7 +26,7 @@
   * authorization.                                                           *
@@ -55441 +75718 @@
  /*
 - * $Id: test_addwstr.c,v 1.6 2010/12/12 00:18:00 tom Exp $
-+ * $Id: test_addwstr.c,v 1.7 2011/12/10 19:55:10 tom Exp $
++ * $Id: test_addwstr.c,v 1.8 2012/06/09 20:29:33 tom Exp $
   *
   * Demonstrate the waddwstr() and wadd_wch functions.
@@ -55457 +75734 @@
      if (first) {
         static char cmd[80];
+@@ -286,7 +287,7 @@
+     if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-       wbkgdset(work, COLOR_PAIR(1) | ' ');
++       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));
+     }
+ 
+     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
+diff -Naur ncurses-5.9.orig/test/test_getstr.c ncurses-5.9/test/test_getstr.c
+--- ncurses-5.9.orig/test/test_getstr.c 2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/test_getstr.c      2012-08-25 19:58:01.903222442 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 2007-2009,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_getstr.c,v 1.9 2009/08/29 19:02:25 tom Exp $
++ * $Id: test_getstr.c,v 1.10 2012/07/07 18:22:49 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -58,6 +58,15 @@
+     eMaxFlavor
+ } Flavors;
+ 
++/*
++ * Return-code is OK/ERR or a keyname.
++ */
++static const char *
++ok_keyname(int code)
++{
++    return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code)));
++}
++
+ static bool
+ Quit(int ch)
+ {
+@@ -310,7 +319,7 @@
+            }
+            noecho();
+            (void) wattrset(txtwin, A_NORMAL);
+-           wprintw(strwin, "%d:%s", rc, buffer);
++           wprintw(strwin, "%s:%s", ok_keyname(rc), buffer);
+            wnoutrefresh(strwin);
+            break;
+        default:
 diff -Naur ncurses-5.9.orig/test/testaddch.c ncurses-5.9/test/testaddch.c
---- ncurses-5.9.orig/test/testaddch.c   2012-02-16 18:25:12.631809302 +0000
-+++ ncurses-5.9/test/testaddch.c        2012-02-16 18:25:13.039820069 +0000
+--- ncurses-5.9.orig/test/testaddch.c   2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/testaddch.c        2012-08-25 19:58:00.093231002 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -55494 +75824 @@
         bkgdset(back);
         (void) attrset(set);
+diff -Naur ncurses-5.9.orig/test/testcurs.c ncurses-5.9/test/testcurs.c
+--- ncurses-5.9.orig/test/testcurs.c    2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/test/testcurs.c 2012-08-25 19:58:01.803222916 +0000
+@@ -6,7 +6,7 @@
+  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
+  *                  PDCurses or under Unix System V, R4
+  *
+- * $Id: testcurs.c,v 1.43 2010/11/13 21:02:28 tom Exp $
++ * $Id: testcurs.c,v 1.44 2012/06/09 19:10:45 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -85,7 +85,7 @@
+ #ifdef A_COLOR
+        if (has_colors()) {
+            init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-           wbkgd(win, COLOR_PAIR(1));
++           wbkgd(win, (chtype) COLOR_PAIR(1));
+        } else
+            wbkgd(win, A_REVERSE);
+ #else
+@@ -491,7 +491,7 @@
+ #ifdef A_COLOR
+        if (has_colors()) {
+            init_pair(3, COLOR_BLUE, COLOR_WHITE);
+-           wbkgd(win1, COLOR_PAIR(3));
++           wbkgd(win1, (chtype) COLOR_PAIR(3));
+        } else
+            wbkgd(win1, A_NORMAL);
+ #else
 diff -Naur ncurses-5.9.orig/test/view.c ncurses-5.9/test/view.c
---- ncurses-5.9.orig/test/view.c        2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/test/view.c     2012-02-16 18:25:13.039820069 +0000
+--- ncurses-5.9.orig/test/view.c        2012-08-25 19:57:59.403234265 +0000
++++ ncurses-5.9/test/view.c     2012-08-25 19:58:01.806556233 +0000
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -55509 +75869 @@
   *
 - * $Id: view.c,v 1.81 2010/11/14 01:06:02 tom Exp $
-+ * $Id: view.c,v 1.84 2011/12/10 15:42:34 tom Exp $
++ * $Id: view.c,v 1.85 2012/06/09 20:29:33 tom Exp $
   */
  
@@ -55542 +75902 @@
      wchar_t wstr[CCHARW_MAX + 1];
      wchar_t wch;
+@@ -354,7 +356,7 @@
+        if (has_colors()) {
+            start_color();
+            init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
+-           bkgd(COLOR_PAIR(my_pair));
++           bkgd((chtype) COLOR_PAIR(my_pair));
+        } else {
+            try_color = FALSE;
+        }
 @@ -373,10 +375,12 @@
                 adjust(0);