Index: BOOK/cross-tools/common/ncurses.xml
===================================================================
--- BOOK/cross-tools/common/ncurses.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/cross-tools/common/ncurses.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -33,4 +33,5 @@
     the host system.</para>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../temp-system/common/ncurses.xml"
@@ -40,4 +41,5 @@
     href="../../temp-system/common/ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <para os="a">Prepare Ncurses for compilation:</para>
Index: BOOK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/final-system/common/ncurses.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -26,8 +26,10 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <para os="p1">The following patch contains updates from the &ncurses-version; branch
     by the Ncurses developers:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&ncurses-branch_update-patch;</userinput></screen>
+-->
 
     <para os="a">Prepare Ncurses for compilation:</para>
@@ -39,7 +41,5 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <variablelist os="b1">
@@ -99,5 +99,5 @@
 ln -sfv libncursesw.a /usr/lib/libcursesw.a
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
+ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
 
   </sect2>
@@ -113,5 +113,5 @@
       <seglistitem>
         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
+        ncursesw6-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
         <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
@@ -166,10 +166,10 @@
       </varlistentry>
 
-      <varlistentry id="ncursesw5-config">
-        <term><command>ncursesw5-config</command></term>
+      <varlistentry id="ncursesw6-config">
+        <term><command>ncursesw6-config</command></term>
         <listitem>
           <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncursesw5-config">
-            <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
+          <indexterm zone="ch-system-ncurses ncursesw6-config">
+            <primary sortas="b-ncursesw6-config">ncursesw6-config</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-64bit.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/final-system/multilib/ncurses-64bit.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -22,4 +22,5 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
@@ -29,4 +30,5 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41,7 +43,5 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -65,9 +65,9 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper and then wrap it:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-64}
-ln -svf multiarch_wrapper /usr/bin/ncursesw5-config</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-64}
+ln -svf multiarch_wrapper /usr/bin/ncursesw6-config</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98,6 +98,6 @@
 ln -sfv libncurses.a /usr/lib64/libcurses.a
 ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
-ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
-ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
+ln -sfv ncursesw6-config-64 /usr/bin/ncurses6-config-64
+ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-n32.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/final-system/multilib/ncurses-n32.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -23,4 +23,5 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
@@ -30,4 +31,5 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42,7 +44,5 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -66,8 +66,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-n32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-n32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98,5 +98,5 @@
 ln -sfv libncurses.a /usr/lib32/libcurses.a
 ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
-ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/ncurses.xml
===================================================================
--- BOOK/final-system/multilib/ncurses.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/final-system/multilib/ncurses.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -23,4 +23,5 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
@@ -30,4 +31,5 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42,7 +44,5 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -70,8 +70,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -104,5 +104,5 @@
 ln -sfv libncurses.a /usr/lib/libcurses.a
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
 
   </sect2>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/introduction/common/changelog.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -41,4 +41,8 @@
       <itemizedlist>
         <listitem>
+          <para>[William Harrington] - Upgrade to Ncurses 6.0.
+          Fixes ticket <ulink url="&clfs-ticket-root;1044">#1044.</ulink></para>
+        </listitem>
+        <listitem>
           <para>[William Harrington] - Upgrade to GCC 5.3.0.
           Fixes ticket <ulink url="&clfs-ticket-root;1094">#1094.</ulink></para>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/materials/common/patches.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -130,4 +130,5 @@
     </varlistentry>
 
+<!--Ncurses Branch Update Area
     <varlistentry>
       <term>Ncurses Branch Update Patch - <token>&ncurses-branch_update-patch-size;</token>:</term>
@@ -138,4 +139,5 @@
       </listitem>
     </varlistentry>
+-->
 
     <varlistentry>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/packages.ent	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -339,8 +339,8 @@
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 
-<!ENTITY ncurses-version "5.9">
-<!ENTITY ncurses-size "2,764 KB">
+<!ENTITY ncurses-version "6.0">
+<!ENTITY ncurses-size "3,132 KB">
 <!ENTITY ncurses-url "&gnu;ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
+<!ENTITY ncurses-md5 "ee13d052e1ead260d7c28071f46eefb1">
 <!ENTITY ncurses-home "&gnu-software;ncurses">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/patches.ent	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -62,7 +62,9 @@
 <!ENTITY ncurses-bashfix-patch-size ".743 KB">
 
+<!--Ncurses Branch Update Area
 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-4.patch">
 <!ENTITY ncurses-branch_update-patch-md5 "c2b2dc2d31b02c218359e6218f12a72c">
 <!ENTITY ncurses-branch_update-patch-size "2,492 KB">
+-->
 
 <!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-4.patch">
Index: BOOK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/temp-system/common/ncurses.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -26,7 +26,9 @@
     temporary environment, including Bash, Util-linux, and Vim.</para>
 
+<!--Ncurses Branch Update Area
     <para os="p1">The following patch fixes an issue with some Bash versions:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ BOOK/temp-system/multilib/ncurses.xml	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -27,4 +27,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
@@ -34,4 +35,5 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: tches/ncurses-5.9-bash_fix-1.patch
===================================================================
--- patches/ncurses-5.9-bash_fix-1.patch	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Submitted by: Jim Gifford (patches at jg555 dot com)
-Date: 2007-02-15
-Initial Package Version: 5.6
-Upstream Status: Sent
-Origin: Jim Gifford
-Description: Fixes Ncurses to utilize a buggy version of Bash
-
-diff -Naur ncurses-5.6.orig/include/MKhashsize.sh ncurses-5.6/include/MKhashsize.sh
---- ncurses-5.6.orig/include/MKhashsize.sh	2006-10-21 17:45:39.000000000 -0700
-+++ ncurses-5.6/include/MKhashsize.sh	2007-02-15 07:16:46.000000000 -0800
-@@ -35,7 +35,7 @@
- echo " */"
- 
- CAPS="${1-Caps}"
--TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l`
-+TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l)
- 
- echo ""
- echo "#define CAPTABSIZE	${TABSIZE}"
-
-
Index: tches/ncurses-5.9-branch_update-4.patch
===================================================================
--- patches/ncurses-5.9-branch_update-4.patch	(revision a55f9e7273d378f6247c3a26cf4f3774f419568b)
+++ 	(revision )
@@ -1,75926 +1,0 @@
-Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
-Date: 2012-08-25
-Initial Package Version: 5.9
-Origin: Upstream
-Upstream Status: Applied
-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-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***************************************************************************
--dnl Copyright (c) 2010,2011 Free Software Foundation, Inc.                   *
-+dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 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
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -39,6 +39,31 @@
- dnl
- dnl ---------------------------------------------------------------------------
- dnl ---------------------------------------------------------------------------
-+dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03
-+dnl ------------------
-+dnl Conditionally generate script according to whether we're using a given autoconf.
-+dnl
-+dnl $1 = version to compare against
-+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
-+dnl $3 = code to use if AC_ACVERSION is older than $1.
-+define(CF_ACVERSION_CHECK,
-+[
-+ifdef([m4_version_compare],
-+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
-+[CF_ACVERSION_COMPARE(
-+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
-+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50
-+dnl --------------------
-+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
-+dnl                      MAJOR2, MINOR2, TERNARY2,
-+dnl                      PRINTABLE2, not FOUND, FOUND)
-+define(CF_ACVERSION_COMPARE,
-+[ifelse(builtin([eval], [$2 < $5]), 1,
-+[ifelse([$8], , ,[$8])],
-+[ifelse([$9], , ,[$9])])])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
- dnl -------------------
- dnl Construct the list of include-options for the C programs in the Ada95
-@@ -290,12 +315,33 @@
- }
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
-+dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45
- dnl ----------------
--dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
--dnl in the sharutils 4.2 distribution.
-+dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
-+dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
- AC_DEFUN([CF_ANSI_CC_CHECK],
- [
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+# into CC.  This will not help with broken scripts that wrap the compiler with
-+# options, but eliminates a more common category of user confusion.
-+AC_MSG_CHECKING(\$CC variable)
-+case "$CC" in #(vi
-+*[[\ \	]]-[[IUD]]*)
-+	AC_MSG_RESULT(broken)
-+	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
-+	# humor him...
-+	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
-+	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
-+	CF_ADD_CFLAGS($cf_flags)
-+	;;
-+*)
-+	AC_MSG_RESULT(ok)
-+	;;
-+esac
-+
- AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
- cf_cv_ansi_cc=no
- cf_save_CFLAGS="$CFLAGS"
-@@ -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
- dnl ---------------------------------------------------------------------------
--dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00
-+dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13
- dnl ---------------
- dnl Determine the default configuration into which we'll install ncurses.  This
- dnl can be overridden by the user's command-line options.  There's two items to
-@@ -522,7 +597,7 @@
- if test "x$prefix" = "xNONE" ; then
- 	case "$cf_cv_system_name" in
- 		# non-vendor systems don't have a conflict
--	openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu)
-+	openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu)
- 		prefix=/usr
- 		;;
- 	*)	prefix=$ac_default_prefix
-@@ -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 +711,10 @@
- AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
- cf_cv_ncurses_header=none
- for cf_header in ifelse($1,,,[ \
--    $1/curses.h \
--	$1/ncurses.h]) \
--	curses.h \
--	ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h])
-+    $1/ncurses.h \
-+	$1/curses.h]) \
-+	ncurses.h \
-+	curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h])
- do
- AC_TRY_COMPILE([#include <${cf_header}>],
- 	[initscr(); tgoto("?", 0,0)],
-@@ -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_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
-+dnl pkg-config configuration on the local machine.
-+AC_DEFUN([CF_ENABLE_PC_FILES],[
-+AC_REQUIRE([CF_PKG_CONFIG])
-+AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
-+
-+if test "$PKG_CONFIG" != none ; 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)
-+	if test "$enable_pc_files" != no
-+	then
-+		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
-+	fi
-+else
-+	enable_pc_files=no
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
- dnl ---------------
- dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
-@@ -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
- dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
--dnl --------------
--dnl Check if gnat supports SIGINT, and presumably tasking.  For the latter, it
--dnl is noted that gnat may compile a tasking unit even for configurations which
--dnl fail at runtime.
--AC_DEFUN([CF_GNAT_SIGINT],[
--AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[
--CF_GNAT_TRY_LINK([with Ada.Interrupts.Names;
--
--package ConfTest is
--
--   pragma Warnings (Off);  --  the next pragma exists since 3.11p
--   pragma Unreserve_All_Interrupts;
--   pragma Warnings (On);
--
--   protected Process is
--      procedure Stop;
--      function Continue return Boolean;
--      pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT);
--   private
--      Done : Boolean := False;
--   end Process;
--
--end ConfTest;],
--[package body ConfTest is
--   protected body Process is
--      procedure Stop is
--      begin
--         Done := True;
--      end Stop;
--      function Continue return Boolean is
--      begin
--         return not Done;
--      end Continue;
--   end Process;
--end ConfTest;],
--	[cf_cv_gnat_sigint=yes],
--	[cf_cv_gnat_sigint=no])])
--
--if test $cf_cv_gnat_sigint = yes ; then
--	USE_GNAT_SIGINT=""
--else
--	USE_GNAT_SIGINT="#"
--fi
--AC_SUBST(USE_GNAT_SIGINT)
--])dnl
--dnl ---------------------------------------------------------------------------
- dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
- dnl --------------------
- dnl Check if the gnat pragma "Unreferenced" works.
-@@ -1253,6 +1402,53 @@
- AC_SUBST(USE_GNAT_LIBRARIES)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
-+dnl --------------
-+dnl Check if gnat supports SIGINT, and presumably tasking.  For the latter, it
-+dnl is noted that gnat may compile a tasking unit even for configurations which
-+dnl fail at runtime.
-+AC_DEFUN([CF_GNAT_SIGINT],[
-+AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[
-+CF_GNAT_TRY_LINK([with Ada.Interrupts.Names;
-+
-+package ConfTest is
-+
-+   pragma Warnings (Off);  --  the next pragma exists since 3.11p
-+   pragma Unreserve_All_Interrupts;
-+   pragma Warnings (On);
-+
-+   protected Process is
-+      procedure Stop;
-+      function Continue return Boolean;
-+      pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT);
-+   private
-+      Done : Boolean := False;
-+   end Process;
-+
-+end ConfTest;],
-+[package body ConfTest is
-+   protected body Process is
-+      procedure Stop is
-+      begin
-+         Done := True;
-+      end Stop;
-+      function Continue return Boolean is
-+      begin
-+         return not Done;
-+      end Continue;
-+   end Process;
-+end ConfTest;],
-+	[cf_cv_gnat_sigint=yes],
-+	[cf_cv_gnat_sigint=no])])
-+
-+if test $cf_cv_gnat_sigint = yes ; then
-+	USE_GNAT_SIGINT=""
-+else
-+	USE_GNAT_SIGINT="#"
-+fi
-+AC_SUBST(USE_GNAT_SIGINT)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GNAT_TRY_LINK version: 3 updated: 2011/03/19 14:47:45
- dnl ----------------
- dnl Verify that a test program compiles/links with GNAT.
-@@ -1311,7 +1507,7 @@
- rm -rf conftest* *~conftest*
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41
-+dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10
- dnl ---------------
- dnl Verify version of GNAT.
- AC_DEFUN([CF_GNAT_VERSION],
-@@ -1323,7 +1519,7 @@
- AC_MSG_RESULT($cf_gnat_version)
- 
- case $cf_gnat_version in #(vi
--3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi
-+3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- *)
-@@ -1518,7 +1714,7 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05
-+dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
- dnl ---------------
- dnl For the given system and compiler, find the compiler flags to pass to the
- dnl loader to use the "rpath" feature.
-@@ -1539,10 +1735,10 @@
- linux*|gnu*|k*bsd*-gnu) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--openbsd[[2-9]].*) #(vi
-+openbsd[[2-9]].*|mirbsd*) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
- 	LD_RPATH_OPT="-rpath "
- 	;;
- netbsd*) #(vi
-@@ -1601,11 +1797,11 @@
- $1="$cf_library_path_list [$]$1"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
-+dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10
- dnl -------------
- dnl Compute the library-prefix for the given host system
- dnl $1 = variable to set
--AC_DEFUN([CF_LIB_PREFIX],
-+define([CF_LIB_PREFIX],
- [
- 	case $cf_cv_system_name in #(vi
- 	OS/2*|os2*) #(vi
-@@ -1655,7 +1851,7 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+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,11 +1880,11 @@
- 		;;
- 	shared) #(vi
- 		case $cf_cv_system_name in
--		aix[[56]]*) #(vi
-+		aix[[5-7]]*) #(vi
- 			$2='.a'
- 			$3=[$]$2
- 			;;
--		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
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30
-+dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05
- dnl -----------------
- dnl Tie together the configure-script macros for ncurses.
- dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-@@ -2153,7 +2351,10 @@
- cf_ncuconfig_root=ifelse($1,,ncurses,$1)
- 
- echo "Looking for ${cf_ncuconfig_root}-config"
--AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none)
-+
-+CF_ACVERSION_CHECK(2.52,
-+	[AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)],
-+	[AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)])
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
-@@ -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
- dnl ---------------------------------------------------------------------------
--dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24
-+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
- dnl -------------
- dnl Check for the package-config program, unless disabled by command-line.
- AC_DEFUN([CF_PKG_CONFIG],
-@@ -2563,7 +2764,9 @@
- 	PKG_CONFIG=none
- 	;;
- yes) #(vi
--	AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)
-+	CF_ACVERSION_CHECK(2.52,
-+		[AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
-+		[AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
- 	;;
- *)
- 	PKG_CONFIG=$withval
-@@ -2746,7 +2949,7 @@
- test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_GNAT version: 1 updated: 2010/06/19 15:22:18
-+dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47
- dnl ------------
- dnl Check for gnatmake, ensure that it is complete.
- AC_DEFUN([CF_PROG_GNAT],[
-@@ -2754,6 +2957,7 @@
- AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
- if test "$ac_cv_prog_gnat_exists" = no; then
-    cf_ada_make=
-+   cf_cv_prog_gnat_correct=no
- else
-    CF_GNAT_VERSION
-    AC_CHECK_PROG(M4_exists, m4, yes, no)
-@@ -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: 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 +3110,14 @@
- 	cf_cv_shlib_version_infix=no
- 
- 	case $cf_cv_system_name in #(vi
--	aix[[56]]*) #(vi
-+	aix4.[3-9]*|aix[[5-7]]*) #(vi
- 		if test "$GCC" = yes; then
- 			CC_SHARED_OPTS=
--			MK_SHARED_LIB='$(CC) -shared'
-+			MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
-+		else
-+			# CC_SHARED_OPTS='-qpic=large -G'
-+			# perhaps "-bM:SRE -bnoentry -bexpall"
-+			MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
- 		fi
- 		;;
- 	beos*) #(vi
-@@ -2962,9 +3170,19 @@
- 		# readonly to exploit a quirk in the memory manager.
- 		INSTALL_LIB="-m 555"
- 		;;
-+	interix*)
-+		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-+		if test "$cf_cv_shlib_version" = rel; then
-+			cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
-+		else
-+			cf_shared_soname='`basename $@`'
-+		fi
-+		CC_SHARED_OPTS=
-+		MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
-+		;;
- 	irix*) #(vi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		# tested with IRIX 5.2 and 'cc'.
- 		if test "$GCC" != yes; then
-@@ -2981,18 +3199,39 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
- 		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
- 			LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		CF_SHARED_SONAME
-@@ -3003,12 +3242,12 @@
- 		MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
- 		;;
--	freebsd*) #(vi
-+	dragonfly*|freebsd*) #(vi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
- 			LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
--			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
- 		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
-@@ -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)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 			if test "$cf_cv_shlib_version" = auto; then
- 			if test -f /usr/libexec/ld.elf_so; then
- 				cf_cv_shlib_version=abi
-@@ -3123,9 +3362,12 @@
- 		;;
- 	esac
- 
--	if test -n "$cf_ld_rpath_opt" ; then
--		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
--	fi
-+	# RPATH_LIST is a colon-separated list of directories
-+	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 +3379,7 @@
- 	AC_SUBST(LOCAL_LDFLAGS)
- 	AC_SUBST(LOCAL_LDFLAGS2)
- 	AC_SUBST(INSTALL_LIB)
-+	AC_SUBST(RPATH_LIST)
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
-@@ -3253,6 +3496,45 @@
- AC_SUBST(top_builddir)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50
-+dnl -------------------
-+dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
-+dnl can define it successfully.
-+AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
-+AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-+	AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+],[
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_cv_xopen_source=no],
-+	[cf_save="$CPPFLAGS"
-+	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+	 AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+],[
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_cv_xopen_source=no],
-+	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
-+	CPPFLAGS="$cf_save"
-+	])
-+])
-+
-+if test "$cf_cv_xopen_source" != no ; then
-+	CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
-+	CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
-+	cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+	CF_ADD_CFLAGS($cf_temp_xopen_source)
-+fi
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
- dnl --------
- dnl Make an uppercase version of a variable
-@@ -3415,6 +3697,32 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10
-+dnl ------------------
-+dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
-+dnl "lib" prefix, e.g., because it used the dll naming convention.
-+dnl
-+dnl $1 = variable to set
-+AC_DEFUN([CF_WITH_LIB_PREFIX],
-+[
-+AC_MSG_CHECKING(if you want to have a library-prefix)
-+AC_ARG_WITH(lib-prefix,
-+	[  --with-lib-prefix       override library-prefix],
-+	[with_lib_prefix=$withval],
-+	[with_lib_prefix=auto])
-+AC_MSG_RESULT($with_lib_prefix)
-+
-+if test $with_lib_prefix = auto
-+then
-+	CF_LIB_PREFIX($1)
-+elif test $with_lib_prefix = no
-+then
-+	LIB_PREFIX=
-+else
-+	LIB_PREFIX=$with_lib_prefix
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
- dnl ------------
- dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-@@ -3436,7 +3744,50 @@
- AC_SUBST($3)dnl
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02
-+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47
-+dnl -------------------------
-+dnl Allow the choice of the pkg-config library directory to be overridden.
-+AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
-+if test "$PKG_CONFIG" != none ; then
-+	AC_MSG_CHECKING(for $PKG_CONFIG library directory)
-+	AC_ARG_WITH(pkg-config-libdir,
-+		[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-+		[PKG_CONFIG_LIBDIR=$withval],
-+		[PKG_CONFIG_LIBDIR=yes])
-+
-+	case x$PKG_CONFIG_LIBDIR in #(vi
-+	x/*) #(vi
-+		;;
-+	xyes) #(vi
-+		# look for the library directory using the same prefix as the executable
-+		cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
-+		case x`(arch) 2>/dev/null` in #(vi
-+		*64) #(vi
-+			for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib
-+			do
-+				if test -d $cf_config/pkgconfig
-+				then
-+					PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
-+					break
-+				fi
-+			done
-+			;;
-+		*)
-+			PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig
-+			;;
-+		esac
-+		;;
-+	*)
-+		;;
-+	esac
-+
-+	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
-+fi
-+
-+AC_SUBST(PKG_CONFIG_LIBDIR)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_PTHREAD version: 5 updated: 2011/12/10 19:01:56
- dnl ---------------
- dnl Check for POSIX thread library.
- AC_DEFUN([CF_WITH_PTHREAD],
-@@ -3452,28 +3803,33 @@
-     AC_CHECK_HEADER(pthread.h,[
-         AC_DEFINE(HAVE_PTHREADS_H)
- 
--        AC_MSG_CHECKING(if we can link with the pthread library)
--        cf_save_LIBS="$LIBS"
--        CF_ADD_LIB(pthread)
--        AC_TRY_LINK([
-+	for cf_lib_pthread in pthread c_r
-+	do
-+	    AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library)
-+	    cf_save_LIBS="$LIBS"
-+	    CF_ADD_LIB($cf_lib_pthread)
-+	    AC_TRY_LINK([
- #include <pthread.h>
- ],[
--        int rc = pthread_create(0,0,0,0);
-+		int rc = pthread_create(0,0,0,0);
-+		int r2 = pthread_mutexattr_settype(0, 0);
- ],[with_pthread=yes],[with_pthread=no])
--        LIBS="$cf_save_LIBS"
--        AC_MSG_RESULT($with_pthread)
-+	    LIBS="$cf_save_LIBS"
-+	    AC_MSG_RESULT($with_pthread)
-+	    test "$with_pthread" = yes && break
-+	done
- 
--        if test "$with_pthread" = yes ; then
--            CF_ADD_LIB(pthread)
--            AC_DEFINE(HAVE_LIBPTHREADS)
--        else
--            AC_MSG_ERROR(Cannot link with pthread library)
--        fi
-+	if test "$with_pthread" = yes ; then
-+	    CF_ADD_LIB($cf_lib_pthread)
-+	    AC_DEFINE(HAVE_LIBPTHREADS)
-+	else
-+	    AC_MSG_ERROR(Cannot link with pthread library)
-+	fi
-     ])
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
-+dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -3489,7 +3845,7 @@
- cf_xopen_source=
- 
- case $host_os in #(vi
--aix[[456]]*) #(vi
-+aix[[4-7]]*) #(vi
- 	cf_xopen_source="-D_ALL_SOURCE"
- 	;;
- cygwin) #(vi
-@@ -3500,6 +3856,7 @@
- 	;;
- darwin*) #(vi
- 	cf_xopen_source="-D_DARWIN_C_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- freebsd*|dragonfly*) #(vi
- 	# 5.x headers associate
-@@ -3517,15 +3874,23 @@
- 	;;
- irix[[56]].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
--	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
-+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
-+	cf_XOPEN_SOURCE=
-+	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
- 	;;
- netbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	;;
-+openbsd[[4-9]]*) #(vi
-+	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
-+	cf_xopen_source="-D_BSD_SOURCE"
-+	cf_XOPEN_SOURCE=600
- 	;;
- openbsd*) #(vi
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -3539,36 +3904,11 @@
- sco*) #(vi
- 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
- 	;;
--solaris2.1[[0-9]]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	;;
--solaris2.[[1-9]]) #(vi
-+solaris2.*) #(vi
- 	cf_xopen_source="-D__EXTENSIONS__"
- 	;;
- *)
--	AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
--	AC_TRY_COMPILE([#include <sys/types.h>],[
--#ifndef _XOPEN_SOURCE
--make an error
--#endif],
--	[cf_cv_xopen_source=no],
--	[cf_save="$CPPFLAGS"
--	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	 AC_TRY_COMPILE([#include <sys/types.h>],[
--#ifdef _XOPEN_SOURCE
--make an error
--#endif],
--	[cf_cv_xopen_source=no],
--	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
--	CPPFLAGS="$cf_save"
--	])
--])
--	if test "$cf_cv_xopen_source" != no ; then
--		CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
--		CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
--		cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
--		CF_ADD_CFLAGS($cf_temp_xopen_source)
--	fi
-+	CF_TRY_XOPEN_SOURCE
- 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
- 	;;
- esac
-@@ -3576,4 +3916,33 @@
- if test -n "$cf_xopen_source" ; then
- 	CF_ADD_CFLAGS($cf_xopen_source)
- fi
-+
-+dnl In anything but the default case, we may have system-specific setting
-+dnl which is still not guaranteed to provide all of the entrypoints that
-+dnl _XOPEN_SOURCE would yield.
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+	AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
-+	AC_TRY_COMPILE([#include <stdlib.h>],[
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_XOPEN_SOURCE_set=yes],
-+	[cf_XOPEN_SOURCE_set=no])
-+	AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
-+	if test $cf_XOPEN_SOURCE_set = yes
-+	then
-+		AC_TRY_COMPILE([#include <stdlib.h>],[
-+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-+make an error
-+#endif],
-+		[cf_XOPEN_SOURCE_set_ok=yes],
-+		[cf_XOPEN_SOURCE_set_ok=no])
-+		if test $cf_XOPEN_SOURCE_set_ok = no
-+		then
-+			AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
-+		fi
-+	else
-+		CF_TRY_XOPEN_SOURCE
-+	fi
-+fi
- ])
-diff -Naur ncurses-5.9.orig/Ada95/configure ncurses-5.9/Ada95/configure
---- 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.41 .
- # 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.
-@@ -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
-   --with-pkg-config{=path} enable/disable use of pkg-config
-+  --with-pkg-config-libdir=XXX use given directory for installing pc-files
-   --enable-pc-files       generate and install .pc files for pkg-config
-   --without-tests         suppress build with test-programs
-   --enable-mixed-case     tic should assume mixed-case filenames
-@@ -660,6 +670,7 @@
-   --with-shared           generate shared C-objects (needed for --with-ada-sharedlib)
-   --enable-widec          compile with wide-char/UTF-8 code
-   --with-curses-dir=DIR   directory in which (n)curses is installed
-+  --with-lib-prefix       override library-prefix
-   --with-shlib-version=X  Specify rel or abi version for shared libs
-   --enable-rpath-link     link sample programs with rpath option
- Fine-Tuning Your Configuration:
-@@ -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: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 +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:906: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -900,7 +911,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:903: 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 +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: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: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=: ;;
-     ,);;
-     *)
-       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: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: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:944:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -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: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: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 +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:986: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:978: \$? = $ac_status" >&5
-+  echo "$as_me:989: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -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: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 +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: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: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 +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: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: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; }; }
- 
- fi
--echo "$as_me:1040: 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
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:1047: 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 +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: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; }; }
- 
- fi
--echo "$as_me:1061: 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 +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: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 +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: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; }; }
- 
- fi
--echo "$as_me:1083: 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 +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: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: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: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 +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: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 +1146,23 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1138: 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
- 	case "$cf_cv_system_name" in
- 		# non-vendor systems don't have a conflict
--	openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu)
-+	openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu)
- 		prefix=/usr
- 		;;
- 	*)	prefix=$ac_default_prefix
- 		;;
- 	esac
- fi
--echo "$as_me:1150: 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: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 +1185,7 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1177: result: $includedir" >&5
-+echo "$as_me:1188: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
-@@ -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
--echo "$as_me:1191: 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
--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
--break
--done
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:1214: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:1217: result: no" >&5
--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 $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
--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 "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:1252: result: no" >&5
--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 $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
--break
--done
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:1288: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:1291: result: no" >&5
--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 $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
--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 "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:1326: result: no" >&5
--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 $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
--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 "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:1384: result: no" >&5
--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: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 +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:1219: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1227: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1421: result: no" >&5
-+  echo "$as_me:1230: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1258: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1266: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1460: result: no" >&5
-+  echo "$as_me:1269: result: no" >&5
- echo "${ECHO_T}no" >&6
- 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:1279: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1477:" \
-+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: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:1290: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1485: \"$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:1295: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1490: \"$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:1300: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1497 "configure"
-+#line 1304 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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: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:1323: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1519: \$? = $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 +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:1349: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1548: result: $ac_file" >&5
-+echo "$as_me:1355: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1553: 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
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1559: \"$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:1369: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1569: 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 +1381,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1577: result: yes" >&5
-+echo "$as_me:1384: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1584: 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:1393: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1589: 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:1398: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1594: \$? = $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 +1414,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1610: 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; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1616: result: $ac_cv_exeext" >&5
-+echo "$as_me:1423: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1622: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1628 "configure"
-+#line 1435 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:1447: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1643: \$? = $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 +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:1462: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1662: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1672 "configure"
-+#line 1479 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1684,16 +1491,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1687: \"$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: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:1500: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1696: \$? = $ac_status" >&5
-+  echo "$as_me:1503: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -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: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`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1714: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1720 "configure"
-+#line 1527 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1729,16 +1536,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1732: \"$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: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:1545: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1741: \$? = $ac_status" >&5
-+  echo "$as_me:1548: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -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: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 +1582,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1778: \"$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: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:1591: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1787: \$? = $ac_status" >&5
-+  echo "$as_me:1594: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -1796,7 +1603,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1799 "configure"
-+#line 1606 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -1809,16 +1616,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1812: \"$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: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:1625: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1821: \$? = $ac_status" >&5
-+  echo "$as_me:1628: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -1828,7 +1635,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1831 "configure"
-+#line 1638 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -1840,16 +1647,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1843: \"$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: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:1656: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1852: \$? = $ac_status" >&5
-+  echo "$as_me:1659: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -1879,11 +1686,11 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:1882: 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:1693: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
-@@ -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: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 +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 1724 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1922: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1928: \$? = $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 +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 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:1762: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1961: \$? = $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 +1802,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:1998: 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 +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 1815 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2013: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2019: \$? = $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 +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 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:1853: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2052: \$? = $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 +1884,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2080: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2100 "configure"
-+#line 1907 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- int Autoconf = TIOCGETP;
-@@ -2112,7 +1919,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2115 "configure"
-+#line 1922 "configure"
- #include "confdefs.h"
- #include <termio.h>
- int Autoconf = TCGETA;
-@@ -2125,14 +1932,14 @@
- 
-   fi
- fi
--echo "$as_me:2128: 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
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:2135: 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 +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:1958: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2154: \$? = $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:1963: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2159: \$? = $ac_status" >&5
-+  echo "$as_me:1966: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -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:1977: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2173: 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:1984: checking for POSIXized ISC" >&5
- echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
- if test -d /etc/conf/kconfig.d &&
-    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
--  echo "$as_me:2182: 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 +2000,115 @@
-     CC="$CC -Xp"
-   fi
- else
--  echo "$as_me:2196: result: no" >&5
-+  echo "$as_me:2003: result: no" >&5
- echo "${ECHO_T}no" >&6
-   ISC=
- fi
- 
--echo "$as_me:2201: checking for ${CC:-cc} option to accept ANSI C" >&5
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+# 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:2014: checking \$CC variable" >&5
-+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
-+case "$CC" in #(vi
-+*[\ \	]-[IUD]*)
-+	echo "$as_me:2018: result: broken" >&5
-+echo "${ECHO_T}broken" >&6
-+	{ 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...
-+	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-+	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+for cf_add_cflags in $cf_flags
-+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
-+
-+	;;
-+*)
-+	echo "$as_me:2106: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+	;;
-+esac
-+
-+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 +2212,7 @@
- fi
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 2305 "configure"
-+#line 2215 "configure"
- #include "confdefs.h"
- 
- #ifndef CC_HAS_PROTOS
-@@ -2323,16 +2233,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2326: \"$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: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:2242: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2335: \$? = $ac_status" >&5
-+  echo "$as_me:2245: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ansi_cc="$cf_arg"; break
- else
-@@ -2345,7 +2255,7 @@
- CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:2348: 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 +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: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 +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: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 +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:2413: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2421: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:2514: result: no" >&5
-+  echo "$as_me:2424: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:2521: 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: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 +2442,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:2535: 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:2449: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -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: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 +2511,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:2604: 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 +2522,18 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--echo "$as_me:2615: 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:2529: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2622: 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: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 +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:2548: result: $cf_prog_ln_sf" >&5
- echo "${ECHO_T}$cf_prog_ln_sf" >&6
- 
- test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
- 
--echo "$as_me:2643: 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 +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: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 +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: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 +2611,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:2704: 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 +2619,11 @@
- 	PKG_CONFIG=none
- 	;;
- yes) #(vi
--	if test -n "$ac_tool_prefix"; then
-+
-+if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:2715: 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 +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:2643: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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:2654: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:2746: result: no" >&5
-+  echo "$as_me:2657: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:2683: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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: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:2698: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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,35 +2747,100 @@
- fi
- 
- if test "$PKG_CONFIG" != none ; then
--	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:2750: checking for $PKG_CONFIG library directory" >&5
-+echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
- 
--	# Leave this as something that can be overridden in the environment.
--	if test -z "$PKG_CONFIG_LIBDIR" ; then
--		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
--	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
--  enable_pc_files=no
-+  PKG_CONFIG_LIBDIR=yes
- 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
-+		;;
-+	xyes) #(vi
-+		# look for the library directory using the same prefix as the executable
-+		cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`
-+		case x`(arch) 2>/dev/null` in #(vi
-+		*64) #(vi
-+			for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib
-+			do
-+				if test -d $cf_config/pkgconfig
-+				then
-+					PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
-+					break
-+				fi
-+			done
-+			;;
-+		*)
-+			PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig
-+			;;
-+		esac
-+		;;
-+	*)
-+		;;
-+	esac
-+
-+	echo "$as_me:2787: result: $PKG_CONFIG_LIBDIR" >&5
-+echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
-+fi
-+
-+if test "$PKG_CONFIG" != none ; then
-+	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
-+  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: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 +2850,10 @@
- else
-   cf_with_tests=yes
- fi;
--echo "$as_me:2877: 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: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 +2863,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:2890: 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: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 +2894,7 @@
- fi
- 
- fi
--echo "$as_me:2921: 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 +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: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 +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:2934: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:2962: result: no" >&5
-+  echo "$as_me:2938: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -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: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 +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:2962: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2970: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:2997: result: no" >&5
-+  echo "$as_me:2973: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:2999: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3007: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:3034: result: no" >&5
-+  echo "$as_me:3010: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3034: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3043: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3070: result: no" >&5
-+  echo "$as_me:3046: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:3077: 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 +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:3068: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3077: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3104: result: no" >&5
-+  echo "$as_me:3080: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3121,7 +3097,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3124: 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 +3131,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:3158: result: $cf_cv_makeflags" >&5
-+echo "$as_me:3134: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:3164: 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 +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:3155: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3163: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:3190: result: no" >&5
-+  echo "$as_me:3166: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3190: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3199: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:3226: result: no" >&5
-+  echo "$as_me:3202: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3229: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3237: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:3264: result: no" >&5
-+  echo "$as_me:3240: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3264: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3273: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:3300: result: no" >&5
-+  echo "$as_me:3276: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3303: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3311: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3338: result: no" >&5
-+  echo "$as_me:3314: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3338: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3347: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3374: result: no" >&5
-+  echo "$as_me:3350: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3377: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3385: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3412: result: no" >&5
-+  echo "$as_me:3388: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3412: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3421: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3448: result: no" >&5
-+  echo "$as_me:3424: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3454,7 +3430,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:3457: 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 +3453,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <<EOF
--#line 3480 "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:3459: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3486: \$? = $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 +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}:3473: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -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:3481: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -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: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 +3502,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:3529: result: $DESTDIR" >&5
-+echo "$as_me:3505: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -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: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 +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:3548: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3556: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:3583: result: no" >&5
-+  echo "$as_me:3559: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3588,12 +3564,12 @@
- done
- 
- fi;
--	echo "$as_me:3591: 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: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: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 +3579,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:3606: 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: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 +3590,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:3617: 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: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 +3601,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:3628: 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: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 +3612,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:3639: 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: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 +3623,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:3650: 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 +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: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 +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: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 +3668,27 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:3695: 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: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:3678: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:3707: 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:3686: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--echo "$as_me:3715: 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 +3698,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--echo "$as_me:3725: 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" )
-@@ -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:3732: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -3786,7 +3762,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 3789 "configure"
-+#line 3765 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -3798,16 +3774,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3801: \"$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: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:3783: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3810: \$? = $ac_status" >&5
-+  echo "$as_me:3786: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:3803: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -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}:3837: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -3869,7 +3845,7 @@
- 	fi
- fi
- 
--echo "$as_me:3872: 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 +3855,11 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:3882: 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: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 +3867,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3894 "configure"
-+#line 3870 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -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:3883: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3910: \$? = $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:3889: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3916: \$? = $ac_status" >&5
-+  echo "$as_me:3892: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -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}:3904: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 3933 "configure"
-+#line 3909 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:3922: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3949: \$? = $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:3928: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3955: \$? = $ac_status" >&5
-+  echo "$as_me:3931: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -3966,7 +3942,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 3969 "configure"
-+#line 3945 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:3958: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3985: \$? = $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:3964: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3991: \$? = $ac_status" >&5
-+  echo "$as_me:3967: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -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}: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}:3986: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-     cf_save_CPPFLAGS="$CPPFLAGS"
-     cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -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}: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 4103 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -4137,21 +4113,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4140: \"$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: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:4122: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4149: \$? = $ac_status" >&5
-+  echo "$as_me:4125: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:4154: 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 +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}:4148: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-       cf_save_LIBS="$LIBS"
-       cf_save_LDFLAGS="$LDFLAGS"
-@@ -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}:4245: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
-             CPPFLAGS="$cf_test_CPPFLAGS"
-             LIBS="-lutf8  $cf_save_LIBS"
-             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
-             cat >conftest.$ac_ext <<_ACEOF
--#line 4275 "configure"
-+#line 4251 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:4264: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4291: \$? = $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:4270: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4297: \$? = $ac_status" >&5
-+  echo "$as_me:4273: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:4302: 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 +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: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 +4351,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4378 "configure"
-+#line 4354 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4387,16 +4363,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4390: \"$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: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:4372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4399: \$? = $ac_status" >&5
-+  echo "$as_me:4375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:4392: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -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}:4426: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -4461,48 +4437,87 @@
- cf_ncuconfig_root=ncursesw
- 
- echo "Looking for ${cf_ncuconfig_root}-config"
--for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+  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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NCURSES_CONFIG"; then
-+  ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # 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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:4461: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
-+if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:4469: result: $NCURSES_CONFIG" >&5
-+echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+else
-+  echo "$as_me:4472: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+    test -n "$NCURSES_CONFIG" && break
-+  done
-+fi
-+if test -z "$NCURSES_CONFIG"; then
-+  ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
- 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:4468: 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
-+if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $NCURSES_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
-+  if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # 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=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:4485: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:4500: found $ac_dir/$ac_word" >&5
-+break
- done
- 
--  ;;
--esac
- fi
--NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
--
--if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:4496: result: $NCURSES_CONFIG" >&5
--echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+fi
-+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
-+if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  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:4511: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--  test -n "$NCURSES_CONFIG" && break
-+  test -n "$ac_ct_NCURSES_CONFIG" && break
- done
--test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none"
-+test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
-+
-+  NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
-+fi
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
-@@ -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: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 +4534,13 @@
- 
- cf_cv_ncurses_header=none
- for cf_header in  \
--    ncursesw/curses.h \
--	ncursesw/ncurses.h \
--	curses.h \
--	ncurses.h
-+    ncursesw/ncurses.h \
-+	ncursesw/curses.h \
-+	ncurses.h \
-+	curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4528 "configure"
-+#line 4543 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -4537,16 +4552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4540: \"$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: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:4561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4549: \$? = $ac_status" >&5
-+  echo "$as_me:4564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -4557,11 +4572,11 @@
- done
- 
- fi
--echo "$as_me:4560: 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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4580 "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:4599: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4590: \$? = $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 +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: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 +4674,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4662 "configure"
-+#line 4677 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4671,16 +4686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4674: \"$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: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:4695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4683: \$? = $ac_status" >&5
-+  echo "$as_me:4698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:4715: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4714,7 +4729,7 @@
- 
- }
- 
--echo "$as_me:4717: 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 +4741,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4729 "configure"
-+#line 4744 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -4758,16 +4773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4761: \"$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: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:4782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4770: \$? = $ac_status" >&5
-+  echo "$as_me:4785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -4782,14 +4797,14 @@
- 	done
- 
- fi
--echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4800: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:4792: 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 +4944,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4932 "configure"
-+#line 4947 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4941,16 +4956,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4944: \"$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: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:4965: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4953: \$? = $ac_status" >&5
-+  echo "$as_me:4968: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:4985: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4988,7 +5003,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4991 "configure"
-+#line 5006 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -5012,16 +5027,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5015: \"$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: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:5036: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5024: \$? = $ac_status" >&5
-+  echo "$as_me:5039: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -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:5060: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:5050: 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 +5095,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 5083 "configure"
-+#line 5098 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -5092,16 +5107,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5095: \"$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: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:5116: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5104: \$? = $ac_status" >&5
-+  echo "$as_me:5119: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:5136: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -5161,7 +5176,7 @@
- 	;;
- esac
- 
--echo "$as_me:5164: 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 +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 5197 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5194,16 +5209,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5197: \"$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: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:5218: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5206: \$? = $ac_status" >&5
-+  echo "$as_me:5221: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -5219,7 +5234,7 @@
- done
- 
- fi
--echo "$as_me:5222: 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 +5268,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:5256: 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 +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:5297: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5285: \$? = $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 +5307,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5295 "configure"
-+#line 5310 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5317,15 +5332,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5320: \"$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:5338: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5325: \"$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:5343: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5339,7 +5354,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:5342: 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 +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: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 +5374,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5362 "configure"
-+#line 5377 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5396: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5384: \$? = $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:5402: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5390: \$? = $ac_status" >&5
-+  echo "$as_me:5405: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -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: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: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 +5424,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5412 "configure"
-+#line 5427 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5446: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5434: \$? = $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:5452: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5440: \$? = $ac_status" >&5
-+  echo "$as_me:5455: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -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: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 +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: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 +5486,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5474 "configure"
-+#line 5489 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5508: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5496: \$? = $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:5514: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5502: \$? = $ac_status" >&5
-+  echo "$as_me:5517: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -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: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 +5544,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:5532: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5538 "configure"
-+#line 5553 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -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:5584: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5572: \$? = $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:5590: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5578: \$? = $ac_status" >&5
-+  echo "$as_me:5593: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -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:5603: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:5595: 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 5614 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:5626: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5614: \$? = $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:5632: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5620: \$? = $ac_status" >&5
-+  echo "$as_me:5635: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5622: result: yes" >&5
-+  echo "$as_me:5637: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5629: result: no" >&5
-+echo "$as_me:5644: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -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: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 5738 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:5750: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5738: \$? = $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:5756: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5744: \$? = $ac_status" >&5
-+  echo "$as_me:5759: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5746: result: yes" >&5
-+  echo "$as_me:5761: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5753: result: no" >&5
-+echo "$as_me:5768: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -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: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 +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: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 +5798,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5786 "configure"
-+#line 5801 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:5813: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5801: \$? = $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:5819: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5807: \$? = $ac_status" >&5
-+  echo "$as_me:5822: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5809: result: yes" >&5
-+  echo "$as_me:5824: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5814: result: no" >&5
-+echo "$as_me:5829: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -5831,48 +5846,87 @@
- cf_ncuconfig_root=ncurses
- 
- echo "Looking for ${cf_ncuconfig_root}-config"
--for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+  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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NCURSES_CONFIG"; then
-+  ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # 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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:5870: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
-+if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:5878: result: $NCURSES_CONFIG" >&5
-+echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+else
-+  echo "$as_me:5881: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+    test -n "$NCURSES_CONFIG" && break
-+  done
-+fi
-+if test -z "$NCURSES_CONFIG"; then
-+  ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
- 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:5838: 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
-+if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $NCURSES_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
-+  if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # 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=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:5855: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:5909: found $ac_dir/$ac_word" >&5
-+break
- done
- 
--  ;;
--esac
- fi
--NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
--
--if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:5866: result: $NCURSES_CONFIG" >&5
--echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+fi
-+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
-+if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  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:5920: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--  test -n "$NCURSES_CONFIG" && break
-+  test -n "$ac_ct_NCURSES_CONFIG" && break
- done
--test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none"
-+test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
-+
-+  NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
-+fi
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
-@@ -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: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 +5943,13 @@
- 
- cf_cv_ncurses_header=none
- for cf_header in  \
--    ncurses/curses.h \
--	ncurses/ncurses.h \
--	curses.h \
--	ncurses.h
-+    ncurses/ncurses.h \
-+	ncurses/curses.h \
-+	ncurses.h \
-+	curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5898 "configure"
-+#line 5952 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -5907,16 +5961,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5910: \"$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: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:5970: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5919: \$? = $ac_status" >&5
-+  echo "$as_me:5973: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -5927,11 +5981,11 @@
- done
- 
- fi
--echo "$as_me:5930: 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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5950 "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:6008: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:5960: \$? = $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 +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: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 +6083,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6032 "configure"
-+#line 6086 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6041,16 +6095,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6044: \"$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: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:6104: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6053: \$? = $ac_status" >&5
-+  echo "$as_me:6107: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:6124: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6084,7 +6138,7 @@
- 
- }
- 
--echo "$as_me:6087: 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 +6150,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6099 "configure"
-+#line 6153 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6120,16 +6174,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6123: \"$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: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:6183: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6132: \$? = $ac_status" >&5
-+  echo "$as_me:6186: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6144,14 +6198,14 @@
- 	done
- 
- fi
--echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6201: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:6154: 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 +6345,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6294 "configure"
-+#line 6348 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6303,16 +6357,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6306: \"$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: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:6366: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6315: \$? = $ac_status" >&5
-+  echo "$as_me:6369: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:6386: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6350,7 +6404,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6353 "configure"
-+#line 6407 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6374,16 +6428,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6377: \"$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: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:6437: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6386: \$? = $ac_status" >&5
-+  echo "$as_me:6440: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -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:6461: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6412: 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 +6496,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6445 "configure"
-+#line 6499 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6454,16 +6508,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6457: \"$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: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:6517: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6466: \$? = $ac_status" >&5
-+  echo "$as_me:6520: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:6537: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6523,7 +6577,7 @@
- 	;;
- esac
- 
--echo "$as_me:6526: 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 +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 6598 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6556,16 +6610,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6559: \"$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: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:6619: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6568: \$? = $ac_status" >&5
-+  echo "$as_me:6622: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6581,7 +6635,7 @@
- done
- 
- fi
--echo "$as_me:6584: 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 +6669,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:6618: 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 +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:6698: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6647: \$? = $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 +6708,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6657 "configure"
-+#line 6711 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6679,15 +6733,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6682: \"$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:6739: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6687: \"$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:6744: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6701,7 +6755,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:6704: 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 +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: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 +6775,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6724 "configure"
-+#line 6778 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:6797: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6746: \$? = $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:6803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6752: \$? = $ac_status" >&5
-+  echo "$as_me:6806: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -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: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: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 +6825,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6774 "configure"
-+#line 6828 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:6847: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6796: \$? = $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:6853: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6802: \$? = $ac_status" >&5
-+  echo "$as_me:6856: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -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: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 +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: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 +6887,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6836 "configure"
-+#line 6890 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:6909: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6858: \$? = $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:6915: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6864: \$? = $ac_status" >&5
-+  echo "$as_me:6918: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -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: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 +6945,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:6894: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6900 "configure"
-+#line 6954 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -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:6985: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6934: \$? = $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:6991: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6940: \$? = $ac_status" >&5
-+  echo "$as_me:6994: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -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:7004: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:6957: 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 7015 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:7027: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6976: \$? = $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:7033: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6982: \$? = $ac_status" >&5
-+  echo "$as_me:7036: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:6984: result: yes" >&5
-+  echo "$as_me:7038: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:6991: result: no" >&5
-+echo "$as_me:7045: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -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: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 7139 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:7151: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7100: \$? = $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:7157: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7106: \$? = $ac_status" >&5
-+  echo "$as_me:7160: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7108: result: yes" >&5
-+  echo "$as_me:7162: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7115: result: no" >&5
-+echo "$as_me:7169: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -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: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 +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: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 +7199,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7148 "configure"
-+#line 7202 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:7214: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7163: \$? = $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:7220: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7169: \$? = $ac_status" >&5
-+  echo "$as_me:7223: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7171: result: yes" >&5
-+  echo "$as_me:7225: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7176: result: no" >&5
-+echo "$as_me:7230: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -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:7267: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7216: \$? = $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 +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: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: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
-+
-+# Check whether --with-lib-prefix or --without-lib-prefix was given.
-+if test "${with_lib_prefix+set}" = set; then
-+  withval="$with_lib_prefix"
-+  with_lib_prefix=$withval
-+else
-+  with_lib_prefix=auto
-+fi;
-+echo "$as_me:7301: result: $with_lib_prefix" >&5
-+echo "${ECHO_T}$with_lib_prefix" >&6
-+
-+if test $with_lib_prefix = auto
-+then
-+
- 	case $cf_cv_system_name in #(vi
- 	OS/2*|os2*) #(vi
-         LIB_PREFIX=''
-@@ -7243,7 +7313,12 @@
- 	esac
- cf_prefix=$LIB_PREFIX
- 
--LIB_PREFIX=$cf_prefix
-+elif test $with_lib_prefix = no
-+then
-+	LIB_PREFIX=
-+else
-+	LIB_PREFIX=$with_lib_prefix
-+fi
- 
- LIB_SUFFIX=
- 
-@@ -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: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 +7337,11 @@
- profile) LD_MODEL='-pg';;
- shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:7265: 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: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 +7354,10 @@
- linux*|gnu*|k*bsd*-gnu) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--openbsd[2-9].*) #(vi
-+openbsd[2-9].*|mirbsd*) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
- 	LD_RPATH_OPT="-rpath "
- 	;;
- netbsd*) #(vi
-@@ -7297,17 +7372,17 @@
- *)
- 	;;
- esac
--echo "$as_me:7300: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:7375: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in #(vi
- x-R*)
--	echo "$as_me:7305: 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"
- 	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7310 "configure"
-+#line 7385 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:7397: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7325: \$? = $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:7403: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7331: \$? = $ac_status" >&5
-+  echo "$as_me:7406: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -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: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 +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: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 +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: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 +7452,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:7380: 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 +7461,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:7389: 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"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 7396 "configure"
-+#line 7471 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7405,16 +7480,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7408: \"$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: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:7489: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7417: \$? = $ac_status" >&5
-+  echo "$as_me:7492: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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:7501: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -7431,10 +7506,14 @@
- 	cf_cv_shlib_version_infix=no
- 
- 	case $cf_cv_system_name in #(vi
--	aix[56]*) #(vi
-+	aix4.3-9*|aix[5-7]*) #(vi
- 		if test "$GCC" = yes; then
- 			CC_SHARED_OPTS=
--			MK_SHARED_LIB='$(CC) -shared'
-+			MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
-+		else
-+			# CC_SHARED_OPTS='-qpic=large -G'
-+			# perhaps "-bM:SRE -bnoentry -bexpall"
-+			MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
- 		fi
- 		;;
- 	beos*) #(vi
-@@ -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: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 +7553,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 7477 "configure"
-+#line 7556 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:7568: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7492: \$? = $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:7574: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7498: \$? = $ac_status" >&5
-+  echo "$as_me:7577: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -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: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 +7604,19 @@
- 		# readonly to exploit a quirk in the memory manager.
- 		INSTALL_LIB="-m 555"
- 		;;
-+	interix*)
-+		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-+		if test "$cf_cv_shlib_version" = rel; then
-+			cf_shared_soname='`basename  .${REL_VERSION}`.${ABI_VERSION}'
-+		else
-+			cf_shared_soname='`basename `'
-+		fi
-+		CC_SHARED_OPTS=
-+		MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o '
-+		;;
- 	irix*) #(vi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		# tested with IRIX 5.2 and 'cc'.
- 		if test "$GCC" != yes; then
-@@ -7544,7 +7633,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 
- 	test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -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
- 			LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 
-@@ -7580,12 +7690,12 @@
- 		MK_SHARED_LIB='${LD} -Bshareable -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
- 		;;
--	freebsd*) #(vi
-+	dragonfly*|freebsd*) #(vi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
- 			LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
--			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 
- 	test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -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)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 			if test "$cf_cv_shlib_version" = auto; then
- 			if test -f /usr/libexec/ld.elf_so; then
- 				cf_cv_shlib_version=abi
-@@ -7686,7 +7796,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 7689 "configure"
-+#line 7799 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7698,16 +7808,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7701: \"$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: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:7817: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7710: \$? = $ac_status" >&5
-+  echo "$as_me:7820: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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:7857: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
- 		;;
- 	esac
- 
--	if test -n "$cf_ld_rpath_opt" ; then
--		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
--	fi
-+	# RPATH_LIST is a colon-separated list of directories
-+	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.
- # Make it optional for packagers.
- if test -n "$LOCAL_LDFLAGS"
- then
--	echo "$as_me:7762: 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 +7887,7 @@
- else
-   with_rpath_link=yes
- fi;
--	echo "$as_me:7772: 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 +7898,8 @@
- 
- ###############################################################################
- 
--	case $cf_cv_system_name in
--	os2*)	PATH_SEPARATOR=';'  ;;
--	*)	PATH_SEPARATOR=':'  ;;
--	esac
--
- ###   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: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 +7909,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7799: 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 +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}:7932: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
-@@ -7829,7 +7942,7 @@
- cf_xopen_source=
- 
- case $host_os in #(vi
--aix[456]*) #(vi
-+aix[4-7]*) #(vi
- 	cf_xopen_source="-D_ALL_SOURCE"
- 	;;
- cygwin) #(vi
-@@ -7840,6 +7953,7 @@
- 	;;
- darwin*) #(vi
- 	cf_xopen_source="-D_DARWIN_C_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- freebsd*|dragonfly*) #(vi
- 	# 5.x headers associate
-@@ -7857,17 +7971,18 @@
- 	;;
- irix[56].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 
--echo "$as_me:7863: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7870 "configure"
-+#line 7985 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7882,16 +7997,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7885: \"$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: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:8006: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7894: \$? = $ac_status" >&5
-+  echo "$as_me:8009: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7900,7 +8015,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7903 "configure"
-+#line 8018 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7915,16 +8030,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7918: \"$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: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:8039: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7927: \$? = $ac_status" >&5
-+  echo "$as_me:8042: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -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: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"
- 
- 	;;
- mirbsd*) #(vi
--	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
--	;;
--netbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
--	;;
--openbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
--	;;
--osf[45]*) #(vi
--	cf_xopen_source="-D_OSF_SOURCE"
--	;;
--nto-qnx*) #(vi
--	cf_xopen_source="-D_QNX_SOURCE"
--	;;
--sco*) #(vi
--	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
--	;;
--solaris2.1[0-9]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	;;
--solaris2.[1-9]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__"
--	;;
--*)
--	echo "$as_me:7972: 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
-+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
-+	cf_XOPEN_SOURCE=
-+
-+cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-+
-+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'`
-+
-+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: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}: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
-   ;
-@@ -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
--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
-+	 .[12]??*) #(vi
-+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
-+		;;
-+	 .2) #(vi
-+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
-+		cf_want_posix_source=yes
-+		;;
-+	 .*)
-+		cf_want_posix_source=yes
-+		;;
-+	 esac
-+	 if test "$cf_want_posix_source" = yes ; then
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 8133 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
- main ()
- {
- 
--#ifdef _XOPEN_SOURCE
-+#ifdef _POSIX_SOURCE
- 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
--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
--	CPPFLAGS="$cf_save"
-+	 fi
-+
-+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}:8173: testing if the second compile does not leave our definition intact error ..." 1>&5
-+
-+	 cat >conftest.$ac_ext <<_ACEOF
-+#line 8176 "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:8191: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8194: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8197: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8200: \$? = $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"
-+	 CPPFLAGS="$cf_save_CPPFLAGS"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:8216: 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[^=]*='\''\"[^"]*//'`
-+
-+			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
-+
-+	;;
-+netbsd*) #(vi
-+	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	;;
-+openbsd[4-9]*) #(vi
-+	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
-+	cf_xopen_source="-D_BSD_SOURCE"
-+	cf_XOPEN_SOURCE=600
-+	;;
-+openbsd*) #(vi
-+	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-+	;;
-+osf[45]*) #(vi
-+	cf_xopen_source="-D_OSF_SOURCE"
-+	;;
-+nto-qnx*) #(vi
-+	cf_xopen_source="-D_QNX_SOURCE"
-+	;;
-+sco*) #(vi
-+	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
-+	;;
-+solaris2.*) #(vi
-+	cf_xopen_source="-D__EXTENSIONS__"
-+	;;
-+*)
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 8336 "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:8355: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8358: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8364: \$? = $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 8373 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8395: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8401: \$? = $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"
- 
- 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
- 
- 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
-+
-+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
-+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)
-+	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: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
-+
- # Check whether --enable-largefile or --disable-largefile was given.
- if test "${enable_largefile+set}" = set; then
-   enableval="$enable_largefile"
-@@ -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: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 +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 9119 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8503,16 +9136,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8506: \"$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: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:9145: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8515: \$? = $ac_status" >&5
-+  echo "$as_me:9148: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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:9158: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8528: \$? = $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:9164: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8534: \$? = $ac_status" >&5
-+  echo "$as_me:9167: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -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: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
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:8554: 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 +9192,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8562 "configure"
-+#line 9195 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8579,16 +9212,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8582: \"$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: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:9221: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8591: \$? = $ac_status" >&5
-+  echo "$as_me:9224: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -8597,7 +9230,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8600 "configure"
-+#line 9233 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -8618,16 +9251,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8621: \"$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: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:9260: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8630: \$? = $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 +9271,7 @@
-   break
- done
- fi
--echo "$as_me:8641: 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 +9281,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:8651: 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 +9289,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8659 "configure"
-+#line 9292 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8676,16 +9309,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8679: \"$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: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:9318: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8688: \$? = $ac_status" >&5
-+  echo "$as_me:9321: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -8694,7 +9327,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8697 "configure"
-+#line 9330 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -8715,16 +9348,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8718: \"$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: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:9357: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8727: \$? = $ac_status" >&5
-+  echo "$as_me:9360: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -8735,7 +9368,7 @@
-   break
- done
- fi
--echo "$as_me:8738: 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 +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: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 +9389,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8759 "configure"
-+#line 9392 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8768,16 +9401,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8771: \"$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: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:9410: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8780: \$? = $ac_status" >&5
-+  echo "$as_me:9413: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -8786,7 +9419,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8789 "configure"
-+#line 9422 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -8799,16 +9432,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8802: \"$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: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:9441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8811: \$? = $ac_status" >&5
-+  echo "$as_me:9444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -8819,7 +9452,7 @@
-   break
- done
- fi
--echo "$as_me:8822: 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 +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:9469: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8842 "configure"
-+#line 9475 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -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:9487: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8857: \$? = $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:9493: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8863: \$? = $ac_status" >&5
-+  echo "$as_me:9496: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8901 "configure"
-+#line 9534 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -8919,16 +9552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8922: \"$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: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:9561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8931: \$? = $ac_status" >&5
-+  echo "$as_me:9564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -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: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 +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: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 +9591,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:8961: 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 +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: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 +9610,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:8980: 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 +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: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 +9637,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:9007: 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 +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: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 +9657,7 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:9027: result: $with_develop" >&5
-+echo "$as_me:9660: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###############################################################################
-@@ -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: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 +9676,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:9046: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9056 "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:9693: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9066: \$? = $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 +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: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 +9723,14 @@
- #define HAVE_PTHREADS_H 1
- EOF
- 
--        echo "$as_me:9093: checking if we can link with the pthread library" >&5
--echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
--        cf_save_LIBS="$LIBS"
--        LIBS="-lpthread $LIBS"
--        cat >conftest.$ac_ext <<_ACEOF
--#line 9098 "configure"
-+	for cf_lib_pthread in pthread c_r
-+	do
-+	    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 9733 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -9104,23 +9739,24 @@
- main ()
- {
- 
--        int rc = pthread_create(0,0,0,0);
-+		int rc = pthread_create(0,0,0,0);
-+		int r2 = pthread_mutexattr_settype(0, 0);
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9114: \"$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: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:9756: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9123: \$? = $ac_status" >&5
-+  echo "$as_me:9759: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -9129,27 +9765,29 @@
- with_pthread=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--        LIBS="$cf_save_LIBS"
--        echo "$as_me:9133: result: $with_pthread" >&5
-+	    LIBS="$cf_save_LIBS"
-+	    echo "$as_me:9769: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
-+	    test "$with_pthread" = yes && break
-+	done
- 
--        if test "$with_pthread" = yes ; then
--            LIBS="-lpthread $LIBS"
--            cat >>confdefs.h <<\EOF
-+	if test "$with_pthread" = yes ; then
-+	    LIBS="-l$cf_lib_pthread $LIBS"
-+	    cat >>confdefs.h <<\EOF
- #define HAVE_LIBPTHREADS 1
- EOF
- 
--        else
--            { { echo "$as_me:9143: error: Cannot link with pthread library" >&5
-+	else
-+	    { { 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; }; }
--        fi
-+	fi
- 
- fi
- 
- fi
- 
--echo "$as_me:9152: 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 +9797,18 @@
- else
-   use_weak_symbols=no
- fi;
--echo "$as_me:9162: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9173 "configure"
-+#line 9811 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -9196,16 +9834,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9199: \"$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: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:9843: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9208: \$? = $ac_status" >&5
-+  echo "$as_me:9846: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -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:9857: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- else
-@@ -9243,13 +9881,13 @@
- fi
- 
- # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:9246: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9252 "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.  */
-@@ -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:9921: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9286: \$? = $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:9927: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9292: \$? = $ac_status" >&5
-+  echo "$as_me:9930: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func__nc_TABSIZE=yes
- else
-@@ -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: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 +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: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 +9959,7 @@
- else
-   with_reentrant=$assume_reentrant
- fi;
--echo "$as_me:9324: 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 +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: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 +9991,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:9356: 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,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 $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.
- 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_LINK=
--else
--	ECHO_LINK='@ echo linking $@ ... ;'
--fi
--echo "$as_me:9384: result: $with_echo" >&5
--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: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 +10051,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:9396: 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 +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: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"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9413 "configure"
-+#line 10071 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9427,16 +10085,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9430: \"$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: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:10094: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9439: \$? = $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 +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:10108: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
- 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 10164 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -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: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 +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:10197: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9493: \$? = $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:10202: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -9501,7 +10208,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:9504: 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 +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:10231: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9527: \$? = $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:10236: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in #(vi
- 			Wcast-qual) #(vi
-@@ -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}: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 +10287,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:9573: 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 10293 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -9622,12 +10339,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:9625: \"$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: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:10347: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in #(vi
-@@ -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: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,16 +10390,12 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:9676: result: $with_assertions" >&5
-+echo "$as_me:10393: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
- 	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: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 +10450,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:9740: 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 +10543,13 @@
- *mingw32*) #(vi
- 	;;
- *)
--echo "$as_me:9833: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9839 "configure"
-+#line 10552 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -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:10583: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9873: \$? = $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:10589: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9879: \$? = $ac_status" >&5
-+  echo "$as_me:10592: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -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: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 +10608,7 @@
- 
- else
- 
--echo "$as_me:9898: 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 +10616,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9906 "configure"
-+#line 10619 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10638: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9928: \$? = $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:10644: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9934: \$? = $ac_status" >&5
-+  echo "$as_me:10647: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -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: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 +10670,13 @@
- esac
- 
- ###	Checks for header files.
--echo "$as_me:9960: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9966 "configure"
-+#line 10679 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -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:10687: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9980: \$? = $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 +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 10715 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -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 10733 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -10038,7 +10751,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10041 "configure"
-+#line 10754 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -10064,15 +10777,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10067: \"$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:10783: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:10072: \"$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:10788: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10085,7 +10798,7 @@
- fi
- fi
- fi
--echo "$as_me:10088: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10107 "configure"
-+#line 10820 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -10119,16 +10832,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10122: \"$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: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:10841: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10131: \$? = $ac_status" >&5
-+  echo "$as_me:10844: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -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: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 +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: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 +10872,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10162 "configure"
-+#line 10875 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10894: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10184: \$? = $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:10900: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10190: \$? = $ac_status" >&5
-+  echo "$as_me:10903: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -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: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
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:10208: 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 +10926,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10216 "configure"
-+#line 10929 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10948: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10238: \$? = $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:10954: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10244: \$? = $ac_status" >&5
-+  echo "$as_me:10957: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -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: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 +10973,13 @@
- 
- fi
- 
--echo "$as_me:10263: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10269 "configure"
-+#line 10982 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -10282,16 +10995,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10285: \"$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: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:11004: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10294: \$? = $ac_status" >&5
-+  echo "$as_me:11007: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -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: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 +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: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 +11040,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 10330 "configure"
-+#line 11043 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -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:11092: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10382: \$? = $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:11098: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10388: \$? = $ac_status" >&5
-+  echo "$as_me:11101: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -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: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:11121: 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:10413: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10419 "configure"
-+#line 11132 "configure"
- #include "confdefs.h"
- 
- int
-@@ -10474,16 +11187,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10477: \"$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: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:11196: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10486: \$? = $ac_status" >&5
-+  echo "$as_me:11199: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -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: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 +11218,7 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:10508: 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 +11226,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 10516 "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:11232: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10522: \$? = $ac_status" >&5
-+  echo "$as_me:11235: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 10529 "configure"
-+#line 11242 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -10539,10 +11252,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:10542: \"$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: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 +11268,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10558 "configure"
-+#line 11271 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -10566,15 +11279,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10569: \"$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:11285: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:10574: \"$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:11290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -10589,7 +11302,7 @@
- 
- fi
- 
--echo "$as_me:10592: 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 +11315,7 @@
- 
- ###	Checks for library functions.
- 
--echo "$as_me:10605: 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,68 +11323,10 @@
- 
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
--  echo "$as_me:10613: 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 10619 "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;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:10653: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:10659: \$? = $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:10669: result: $ac_cv_func_mkstemp" >&5
--echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
--
-+  cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10674 "configure"
-+#line 11329 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10709,15 +11364,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10712: \"$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:11370: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:10717: \"$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:11375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -10732,8 +11387,69 @@
- fi
- 
- fi
--echo "$as_me:10735: 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
- #define HAVE_MKSTEMP 1
-@@ -10741,13 +11457,13 @@
- 
- fi
- 
--echo "$as_me:10744: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10750 "configure"
-+#line 11466 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -10769,16 +11485,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10772: \"$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: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:11494: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10781: \$? = $ac_status" >&5
-+  echo "$as_me:11497: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signal=void
- else
-@@ -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:11507: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -10800,12 +11516,13 @@
- 	CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
- fi
- 
-+cf_with_ada=yes
- if test "$cf_with_ada" != "no" ; then
- 
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:10808: 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 +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:11540: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:11549: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:10835: result: no" >&5
-+  echo "$as_me:11552: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$ac_cv_prog_gnat_exists" = no; then
-    cf_ada_make=
-+   cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:10843: 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 | \
- 	grep '[0-9].[0-9][0-9]*' |\
-     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:11566: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in #(vi
--3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi
-+3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) #(vi
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- *)
--	{ echo "$as_me:10856: 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 +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: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 +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:11597: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:11606: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:10891: result: no" >&5
-+  echo "$as_me:11609: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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:11618: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -10925,30 +11643,34 @@
- fi
- rm -rf conftest* *~conftest*
- 
--      echo "$as_me:10928: 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
- 
- 	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: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 +11680,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:10961: 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 +11692,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:10973: 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 +11740,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:11021: 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 +11749,7 @@
- 	USE_GNAT_SIGINT="#"
- fi
- 
--echo "$as_me:11030: 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 +11780,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:11061: 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 +11793,7 @@
- cf_gnat_libraries=no
- cf_gnat_projects=no
- 
--echo "$as_me:11074: 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 +11861,14 @@
- 	esac
- 	;;
- esac
--echo "$as_me:11142: result: $cf_gnat_projects" >&5
-+echo "$as_me:11864: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:11147: 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:11871: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -11166,7 +11888,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:11169: 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 +11899,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:11180: result: $cf_ada_compiler" >&5
-+echo "$as_me:11902: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 		cf_ada_package=terminal_interface
- 
--echo "$as_me:11185: 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.
-@@ -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:11943: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -11227,10 +11949,10 @@
- fi
- ADA_INCLUDE="$withval"
- 
--echo "$as_me:11230: 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: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.
-@@ -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:11991: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -11275,10 +11997,10 @@
- fi
- ADA_OBJECTS="$withval"
- 
--echo "$as_me:11278: 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: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 +12010,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:11291: 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 +12026,12 @@
- fi
- 
- 	else
--		{ { echo "$as_me:11307: 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; }; }
- 	fi
- else
--	{ { echo "$as_me:11312: 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 +12039,9 @@
- ################################################################################
- 
- # not needed
--TINFO_ARGS2=
-+TINFO_LDFLAGS2=
-+
-+TINFO_LIBS=
- 
- ### Construct the list of include-directories to be generated
- 
-@@ -11354,7 +12078,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:11357: 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 +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: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: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,11 +12114,11 @@
- 		;;
- 	shared) #(vi
- 		case $cf_cv_system_name in
--		aix[56]*) #(vi
-+		aix[5-7]*) #(vi
- 			DFT_LIB_SUFFIX='.a'
- 			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 			;;
--		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: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:12151: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -11440,7 +12164,7 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:11443: 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 +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:12383: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -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: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 +12575,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:11854: 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;}
-@@ -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"
- LIB_NAME="$LIB_NAME"
-+LIB_PREFIX="$LIB_PREFIX"
- LIB_SUFFIX="$LIB_SUFFIX"
- LN_S="$LN_S"
- NCURSES_MAJOR="$NCURSES_MAJOR"
-@@ -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:12649: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -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
- s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
-+s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
- s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t
- s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t
- s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t
-@@ -12083,13 +12809,18 @@
- s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
- s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
- s,@INSTALL_LIB@,$INSTALL_LIB,;t t
-+s,@RPATH_LIST@,$RPATH_LIST,;t t
- s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t
- s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
- s,@NCURSES_CONST@,$NCURSES_CONST,;t t
- 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
- s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t
--s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
-+s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t
-+s,@TINFO_LIBS@,$TINFO_LIBS,;t t
- s,@ACPPFLAGS@,$ACPPFLAGS,;t t
- s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t
- s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
-@@ -12237,7 +12969,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:12240: 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 +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: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 +13000,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:12271: 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 +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: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 +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: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 +13090,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:12361: 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 +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: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-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***************************************************************************
--dnl Copyright (c) 2010,2011 Free Software Foundation, Inc.                   *
-+dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 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
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.13.20020210)
--AC_REVISION($Revision: 1.30 $)
-+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 @@
- 
- # if we find pkg-config, check if we should install the ".pc" files.
- CF_PKG_CONFIG
--
--if test "$PKG_CONFIG" != none ; then
--	AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
--
--	# Leave this as something that can be overridden in the environment.
--	if test -z "$PKG_CONFIG_LIBDIR" ; then
--		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
--	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
--		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)
--	else
--		AC_MSG_RESULT(no)
--		AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
--		enable_pc_files=no
--	fi
--fi
--AC_SUBST(PKG_CONFIG_LIBDIR)
-+CF_WITH_PKG_CONFIG_LIBDIR
-+CF_ENABLE_PC_FILES
- 
- AC_MSG_CHECKING(if you want to build test-programs)
- AC_ARG_WITH(tests,
-@@ -186,9 +166,7 @@
- 
- CF_NCURSES_ADDON
- 
--CF_LIB_PREFIX(cf_prefix)
--LIB_PREFIX=$cf_prefix
--AC_SUBST(LIB_PREFIX)
-+CF_WITH_LIB_PREFIX(cf_prefix)
- 
- LIB_SUFFIX=
- AC_SUBST(LIB_SUFFIX)
-@@ -235,8 +213,6 @@
- ###############################################################################
- CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)
- 
--CF_PATHSEP
--
- ###   use option --enable-broken-linker to force on use of broken-linker support
- AC_MSG_CHECKING(if you want broken-linker support code)
- AC_ARG_ENABLE(broken_linker,
-@@ -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
- 
- CF_HELP_MESSAGE(Ada95 Binding Options:)
--
-+cf_with_ada=yes
- dnl Check for availability of GNU Ada Translator (GNAT).
- dnl At the moment we support no other Ada95 compiler.
- if test "$cf_with_ada" != "no" ; then
- 	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 @@
- ################################################################################
- 
- # not needed
--TINFO_ARGS2=
--AC_SUBST(TINFO_ARGS2)
-+TINFO_LDFLAGS2=
-+AC_SUBST(TINFO_LDFLAGS2)
-+TINFO_LIBS=
-+AC_SUBST(TINFO_LIBS)
- 
- ### Construct the list of include-directories to be generated
- CF_INCLUDE_DIRS
-@@ -656,8 +611,8 @@
- AWK="$AWK"
- DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
- DFT_LWR_MODEL="$DFT_LWR_MODEL"
--ECHO_LINK="$ECHO_LINK"
- LIB_NAME="$LIB_NAME"
-+LIB_PREFIX="$LIB_PREFIX"
- LIB_SUFFIX="$LIB_SUFFIX"
- 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-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 @@
- #
- #  Author:  Juergen Pfeifer, 1996
- #
--#  $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $
-+#  $Id: Makefile.in,v 1.76 2012/03/17 16:45:38 tom Exp $
- #
- .SUFFIXES:
- 
-@@ -73,7 +73,7 @@
- LOCAL_LIBDIR	= @top_builddir@/lib
- 
- LINK		= $(HOST_CC)
--LD_FLAGS	= @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@
-+LD_FLAGS	= @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@
- 
- 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)
- 	cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
- @USE_OLD_MAKERULES@	ln -sf ../src/*.ali .
--@USE_GNAT_PROJECTS@	ln -sf ../static-ali/*.ali .	
-+@USE_GNAT_PROJECTS@	ln -sf ../static-ali/*.ali .
- 	@echo "Filtering generated files"
- 	@for f in $(GEN_SRC); do \
- 	   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-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 @@
- 
- /*
-     Version Control
--    $Id: gen.c,v 1.59 2011/03/31 23:50:24 tom Exp $
-+    $Id: gen.c,v 1.60 2011/04/30 19:47:19 Nicolas.Boulenguez Exp $
-   --------------------------------------------------------------------------*/
- /*
-   This program generates various record structures and constants from the
-@@ -124,19 +124,15 @@
- 	  int len,		/* size of the record in bytes          */
- 	  int bias)
- {
--  const char *unused_name = "Unused";
--  int long_bits = (8 * (int)sizeof(unsigned long));
--  int len_bits = (8 * len);
--  int i, j, n, l, cnt = 0, low, high;
-+  const int len_bits = (8 * len);
-+  int i, l, low, high;
-   int width = strlen(RES_NAME) + 3;
-   unsigned long a;
--  unsigned long mask = 0;
- 
-   assert(nap != NULL);
- 
-   for (i = 0; nap[i].name != (char *)0; i++)
-     {
--      cnt++;
-       l = (int)strlen(nap[i].name);
-       if (l > width)
- 	width = l;
-@@ -147,32 +143,8 @@
-   printf("      record\n");
-   for (i = 0; nap[i].name != (char *)0; i++)
-     {
--      mask |= nap[i].attr;
-       printf("         %-*s : Boolean;\n", width, nap[i].name);
-     }
--
--  /*
--   * Compute a mask for the unused bits in this target.
--   */
--  mask = ~mask;
--  /*
--   * Bits in the biased area are unused by the target.
--   */
--  for (j = 0; j < bias; ++j)
--    {
--      mask &= (unsigned long)(~(1L << j));
--    }
--  /*
--   * Bits past the target's size are really unused.
--   */
--  for (j = len_bits + bias; j < long_bits; ++j)
--    {
--      mask &= (unsigned long)(~(1L << j));
--    }
--  if (mask != 0)
--    {
--      printf("         %-*s : Boolean;\n", width, unused_name);
--    }
-   printf("      end record;\n");
-   printf("   pragma Convention (C, %s);\n\n", name);
- 
-@@ -187,17 +159,10 @@
- 	printf("         %-*s at 0 range %2d .. %2d;\n", width, nap[i].name,
- 	       low - bias, high - bias);
-     }
--  if (mask != 0)
--    {
--      l = find_pos((char *)&mask, sizeof(mask), &low, &high);
--      if (l >= 0)
--	printf("         %-*s at 0 range %2d .. %2d;\n", width, unused_name,
--	       low - bias, high - bias);
--    }
--  i = 1;
--  n = cnt;
-   printf("      end record;\n");
-+  printf("   pragma Warnings (Off);");
-   printf("   for %s'Size use %d;\n", name, len_bits);
-+  printf("   pragma Warnings (On);\n");
-   printf("   --  Please note: this rep. clause is generated and may be\n");
-   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-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 @@
- #
- #  Author:  Juergen Pfeifer, 1996
- #
--#  $Id: Makefile.in,v 1.60 2011/03/31 09:46:16 tom Exp $
-+#  $Id: Makefile.in,v 1.62 2011/04/30 22:24:45 tom Exp $
- #
- .SUFFIXES:
- 
-@@ -218,7 +218,9 @@
- 	$(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@
- 
- ###############################################################################
--C_OBJS	= c_varargs_to_ada.o ncurses_compat.o
-+# Use these definitions when building a shared library.
-+SHARED_C_OBJS	= c_varargs_to_ada.o ncurses_compat.o
-+SHARED_OBJS 	= $(SHARED_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@
- 
- c_varargs_to_ada.o :	$(srcdir)/c_varargs_to_ada.c
- 	$(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_varargs_to_ada.c
-@@ -227,13 +229,22 @@
- 	$(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/ncurses_compat.c
- 
- ###############################################################################
-+# Use these definitions when building a static library.
-+STATIC_C_OBJS	= static_c_varargs_to_ada.o static_ncurses_compat.o
-+STATIC_OBJS 	= $(STATIC_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@
- 
--MIXED_OBJS = $(C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@
-+static_c_varargs_to_ada.o :	$(srcdir)/c_varargs_to_ada.c
-+	$(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/c_varargs_to_ada.c
-+
-+static_ncurses_compat.o :	$(srcdir)/ncurses_compat.c
-+	$(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/ncurses_compat.c
-+
-+###############################################################################
- 
- @USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
- @USE_OLD_MAKERULES@		$(BUILD_DIR_LIB) \
--@USE_OLD_MAKERULES@		$(MIXED_OBJS)
--@USE_OLD_MAKERULES@	$(AR) $(ARFLAGS) $@ $(MIXED_OBJS)
-+@USE_OLD_MAKERULES@		$(STATIC_OBJS)
-+@USE_OLD_MAKERULES@	$(AR) $(ARFLAGS) $@ $(STATIC_OBJS)
- 
- $(BUILD_DIR)/static-ali : ; mkdir -p $@
- $(BUILD_DIR)/static-obj : ; mkdir -p $@
-@@ -245,10 +256,10 @@
- 
- @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
- @USE_GNAT_PROJECTS@		$(ABASE)-trace.adb \
--@USE_GNAT_PROJECTS@		$(C_OBJS) \
-+@USE_GNAT_PROJECTS@		$(STATIC_C_OBJS) \
- @USE_GNAT_PROJECTS@		$(STATIC_DIRS)
- @USE_GNAT_PROJECTS@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
--@USE_GNAT_PROJECTS@	$(AR) $(ARFLAGS) $@ $(C_OBJS)
-+@USE_GNAT_PROJECTS@	$(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
- @USE_GNAT_PROJECTS@
- @USE_GNAT_LIBRARIES@install \
- @USE_GNAT_LIBRARIES@install.libs :: \
-@@ -274,8 +285,11 @@
- 	$(BUILD_DIR)/dynamic-obj
- 
- @MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME)
--@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: $(ABASE)-trace.adb $(SHARED_DIRS)
--@MAKE_ADA_SHAREDLIB@	cp $(MIXED_OBJS) $(BUILD_DIR)/dynamic-obj/
-+@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \
-+@MAKE_ADA_SHAREDLIB@		$(ABASE)-trace.adb \
-+@MAKE_ADA_SHAREDLIB@		$(SHARED_DIRS) \
-+@MAKE_ADA_SHAREDLIB@		$(SHARED_OBJS)
-+@MAKE_ADA_SHAREDLIB@	cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
- @MAKE_ADA_SHAREDLIB@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
- 
- install \
-diff -Naur ncurses-5.9.orig/INSTALL ncurses-5.9/INSTALL
---- 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 @@
- -------------------------------------------------------------------------------
---- 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             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.155 2011/03/31 08:27:24 tom Exp $
-+-- $Id: INSTALL,v 1.166 2012/08/11 20:12:34 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -407,13 +407,14 @@
- 
-     --disable-tic-depends
- 	When building shared libraries, normally the tic library is linked to
--	depend upon the ncurses library (and in turn, on the term-library if
--	the --with-termlib option was given).  The tic- and term-libraries
--	ABI does not depend on the --enable-widec option. Some packagers have
--	used this to reduce the number of library files which are packaged
--	by using only one copy of those libraries.  To make this work properly,
-+	depend upon the ncurses library (or equivalently, on the tinfo-library
-+	if the --with-termlib option was given).  The tic- and tinfo-library
-+	ABIs do not depend on the --enable-widec option.  Some packagers have
-+	used this to reduce the number of library files which are packaged by
-+	using only one copy of those libraries.  To make this work properly,
- 	the tic library must be built without an explicit dependency on the
--	ncurses (or ncursesw) library.  Use this configure option to do that.
-+	underlying library (ncurses vs ncursesw, tinfo vs tinfow).  Use this
-+	configure option to do that.
- 	For example
- 		configure --with-ticlib --with-shared --disable-tic-depends
- 
-@@ -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.
- 
-+	Termcap support requires run-time parsing rather than loading
-+	predigested data.  If you have specified --with-ticlib, then you
-+	cannot have termcap support since run-time parsing is done in the
-+	tic library, which is intentionally not part of normal linkage
-+	dependencies.
-+
-     --enable-warnings
- 	Turn on GCC compiler warnings.  There should be only a few.
- 
-@@ -824,7 +842,17 @@
- 	NOTE: a few systems build shared libraries with fixed pathnames; this
- 	option probably will not work for those configurations.
- 
--     --with-libtool[=XXX]
-+    --with-lib-prefix=XXX
-+	OS/2 EMX used a different naming convention from most Unix-like
-+	platforms.  It required that the "lib" part of a library name was
-+	omitted.  Newer EMX as part of eComStation does not follow that
-+	convention.  Use this option to override the configure script's
-+	assumptions about the library-prefix.  If this option is omitted, it
-+	uses the original OS/2 EMX convention for that platform.  Use
-+	"--with-lib-prefix=lib" for the newer EMX in eComStation.  Use
-+	"--without-lib-prefix" to suppress it for other odd platforms.
-+
-+    --with-libtool[=XXX]
- 	Generate libraries with libtool.  If this option is selected, then it
- 	overrides all other library model specifications.  Note that libtool
- 	must already be installed, uses makefile rules dependent on GNU make,
-@@ -904,6 +932,10 @@
-     --with-pkg-config=[DIR]
- 	Check for pkg-config, optionally specifying its path.
- 
-+    --with-pkg-config-libdir=[DIR]
-+	If pkg-config was found, override the automatic check for its library
-+	path.
-+
-     --with-profile
- 	Generate profile-libraries These are named by adding "_p" to the root,
- 	e.g., libncurses_p.a
-@@ -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.
- 
-+    --with-xterm-kbs=XXX
-+	Configure xterm's terminfo entries to use either BS (^H, i.e., ASCII
-+	backspace) or DEL (^?, or 127).  XXX can be BS (or bs, 8) or DEL
-+	(or del, 127).
-+
-+	During installation, the makefile and scripts modifies the "xterm+kbs"
-+	terminfo entry to use this setting.
-+
-     --with-valgrind
- 	For testing, compile with debug option.
- 	This also sets the --disable-leaks option.
-@@ -1024,6 +1073,8 @@
- 	install as "ncurses.h" and modify the installed headers and manpages
- 	accordingly.
- 
-+	Likewise, do not install an alias "curses" for the ncurses manpage.
-+
-     --without-cxx
- 	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 +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
- 	(the process needs infocmp(1)).  To do so, use the script
--	ncurses/tinfo/MKfallback.sh.  A configure script option
-+	ncurses/tinfo/MKfallback.sh.  The configure script option
- 	--with-fallbacks does this (it accepts a comma-separated list of the
- 	names you wish, and does not require a rebuild).
- 
- 	If you wanted (say) to have linux, vt100, and xterm fallbacks, you
--	would use the commands
-+	might use the commands
- 
- 		cd ncurses;
--		tinfo/MKfallback.sh linux vt100 xterm >fallback.c
-+		tinfo/MKfallback.sh \
-+			$TERMINFO \
-+			../misc/terminfo.src \
-+			`which tic` \
-+			linux vt100 xterm >fallback.c
-+
-+	The first three parameters of the script are normally supplied by
-+	the configured makefiles via the "--with-fallbacks" option.  They
-+	are
-+
-+		1) the location of the terminfo database
-+		2) the source for the terminfo entries
-+		3) the location of the tic program, used to create a terminfo
-+		   database.
- 
- 	Then just rebuild and reinstall the library as you would normally.
- 	You can restore the default empty fallback list with
- 
--		tinfo/MKfallback.sh >fallback.c
-+		tinfo/MKfallback.sh \
-+			$TERMINFO \
-+			../misc/terminfo.src \
-+			`which tic` \
-+			>fallback.c
- 
- 	The overhead for an empty fallback list is one trivial stub function.
- 	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-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 +766,6 @@
- ./mk-0th.awk
- ./mk-1st.awk
- ./mk-2nd.awk
--./mk-dlls.sh.in
- ./mk-hdr.awk
- ./ncurses/Makefile.in
- ./ncurses/README
-@@ -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
- ./test/clip_printw.c
-+./test/color_name.h
- ./test/color_set.c
- ./test/configure
- ./test/configure.in
-diff -Naur ncurses-5.9.orig/Makefile.in ncurses-5.9/Makefile.in
---- 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.34 2012/08/11 21:41:19 tom Exp $
- ##############################################################################
--# 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 "Software"), #
-@@ -35,7 +35,8 @@
- VPATH		= @srcdir@
- 
- DESTDIR=@DESTDIR@
--CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)"
-+RPATH_LIST=@RPATH_LIST@
-+CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
- 
- @SET_MAKE@
- 
-@@ -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'
- 
--dlls:	libs
--	$(SHELL) $(srcdir)/mk-dlls.sh
--
- distclean \
- realclean ::
--	-rm -f mk-dlls.sh mingw_arch
-+
- 
- # Put the common rules here so that we can easily construct the list of
- # directories to visit.
-diff -Naur ncurses-5.9.orig/NEWS ncurses-5.9/NEWS
---- 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 @@
- -------------------------------------------------------------------------------
---- 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             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.1682 2011/04/04 00:02:42 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,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
-+	+ make sgr for att5425 agree with other caps -TD
-+	+ make sgr for att630 agree with other caps -TD
-+	+ make sgr for linux entries agree with other caps -TD
-+	+ make sgr for tvi9065 agree with other caps -TD
-+	+ make sgr for ncr260vt200an agree with other caps -TD
-+	+ make sgr for ncr160vt100pp agree with other caps -TD
-+	+ make sgr for ncr260vt300an agree with other caps -TD
-+	+ make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD
-+	+ make sgr for cygwin, cygwinDBG agree with other caps -TD
-+	+ add configure option --with-xterm-kbs to simplify configuration for
-+	  Linux versus most other systems.
-+
-+20120204
-+	+ improved tic -D option, avoid making target directory and provide
-+	  better diagnostics.
-+
-+20120128
-+	+ add mach-gnu (Debian #614316, patch by Samuel Thibault)
-+	+ add mach-gnu-color, tweaks to mach-gnu terminfo -TD
-+	+ make sgr for sun-color agree with smso -TD
-+	+ make sgr for prism9 agree with other caps -TD
-+	+ make sgr for icl6404 agree with other caps -TD
-+	+ make sgr for ofcons agree with other caps -TD
-+	+ make sgr for att5410v1, att4415, att620 agree with other caps -TD
-+	+ make sgr for aaa-unk, aaa-rv agree with other caps -TD
-+	+ make sgr for avt-ns agree with other caps -TD
-+	+ amend fix intended to separate fixups for acsc to allow "tic -cv" to
-+	  give verbose warnings (cf:  20110730). 
-+	+ modify misc/gen-edit.sh to make the location of the tabset directory
-+	  consistent with misc/Makefile.in, i.e., using ${datadir}/tabset
-+	  (Debian #653435, patch by Sven Joachim).
-+
-+20120121
-+	+ add --with-lib-prefix option to allow configuring for old/new flavors
-+	  of OS/2 EMX.
-+	+ modify check for gnat version to allow for year, as used in FreeBSD
-+	  port.
-+	+ modify check_existence() in db_iterator.c to simply check if the
-+	  path is a directory or file, according to the need.  Checking for
-+	  directory size also gives no usable result with OS/2 (cf: 20120107).
-+	+ support OS/2 kLIBC (patch by KO Myung-Han).
-+
-+20120114
-+	+ several improvements to test/movewindow.c (prompted by discussion on
-+	  Linux Mint forum):
-+	  + modify movement commands to make them continuous
-+	  + rewrote the test for mvderwin
-+	  + rewrote the test for recursive mvwin
-+	+ split-out reusable CF_WITH_NCURSES_ETC macro in test/configure.in
-+	+ updated configure macro CF_XOPEN_SOURCE, build-fixes for Mac OS X
-+	  and OpenBSD.
-+	+ regenerated html manpages.
-+
-+20120107
-+	+ various improvments for MinGW (Juergen Pfeifer):
-+	  + modify stat() calls to ignore the st_size member
-+	  + drop mk-dlls.sh script.
-+	  + change recommended regular expression library.
-+	  + modify rain.c to allow for threaded configuraton.
-+	  + modify tset.c to allow for case when size-change logic is not used. 
-+
-+20111231
-+	+ modify toe's report when -a and -s options are combined, to add
-+	  a column showing which entries belong to a given database.
-+	+ add -s option to toe, to sort its output.
-+	+ modify progs/toe.c, simplifying use of db-iterator results to use
-+	  caching improvements from 20111001 and 20111126.
-+	+ correct generation of pc-files when ticlib or termlib options are
-+	  given to rename the corresponding tic- or tinfo-libraries (report
-+	  by Sven Joachim).
-+
-+20111224
-+	+ document a portability issue with tput, i.e., that scripts which work
-+	  with ncurses may fail in other implementations that do no parameter
-+	  analysis.
-+	+ add putty-sco entry -TD
-+
-+20111217
-+	+ review/fix places in manpages where --program-prefix configure option
-+	  was not being used.
-+	+ add -D option to infocmp, to show the database locations that it
-+	  could use.
-+	+ fix build for the special case where term-driver, ticlib and termlib
-+	  are all enabled.  The terminal driver depends on a few features in
-+	  the base ncurses library, so tic's dependencies include both ncurses
-+	  and termlib.
-+	+ fix build work for term-driver when --enable-wgetch-events option is
-+	  enabled.
-+	+ use <stdint.h> types to fix some questionable casts to void*.
-+
-+20111210
-+	+ modify configure script to check if thread library provides
-+	  pthread_mutexattr_settype(), e.g., not provided by Solaris 2.6
-+	+ modify configure script to suppress check to define _XOPEN_SOURCE
-+	  for IRIX64, since its header files have a conflict versus
-+	  _SGI_SOURCE.
-+	+ modify configure script to add ".pc" files for tic- and
-+	  tinfo-libraries, which were omitted in recent change (cf: 20111126).
-+	+ fix inconsistent checks on $PKG_CONFIG variable in configure script.
-+
-+20111203
-+	+ modify configure-check for etip.h dependencies, supplying a temporary
-+	  copy of ncurses_dll.h since it is a generated file (prompted by
-+	  Debian #646977).
-+	+ modify CF_CPP_PARAM_INIT "main" function to work with current C++.
-+
-+20111126
-+	+ correct database iterator's check for duplicate entries
-+	  (cf: 20111001).
-+	+ modify database iterator to ignore $TERMCAP when it is not an
-+	  absolute pathname.
-+	+ add -D option to tic, to show the database locations that it could
-+	  use.
-+	+ improve description of database locations in tic manpage.
-+	+ modify the configure script to generate a list of the ".pc" files to
-+	  generate, rather than deriving the list from the libraries which have
-+	  been built (patch by Mike Frysinger).
-+	+ use AC_CHECK_TOOLS in preference to AC_PATH_PROGS when searching for
-+	  ncurses*-config, e.g., in Ada95/configure and test/configure (adapted
-+	  from patch by Mike Frysinger).
-+
-+20111119
-+	+ remove obsolete/conflicting fallback definition for _POSIX_SOURCE
-+	  from curses.priv.h, fixing a regression with IRIX64 and Tru64
-+	  (cf: 20110416)
-+	+ modify _nc_tic_dir() to ensure that its return-value is nonnull,
-+	  i.e., the database iterator was not initialized.  This case is needed
-+	  to when tic is translating to termcap, rather than loading the
-+	  database (cf:  20111001).
-+
-+20111112
-+	+ add pccon entries for OpenBSD console (Alexei Malinin).
-+	+ build-fix for OpenBSD 4.9 with gcc 4.2.1, setting _XOPEN_SOURCE to
-+	  600 to work around inconsistent ifdef'ing of wcstof between C and
-+	  C++ header files.
-+	+ modify capconvert script to accept more than exact match on "xterm",
-+	  e.g., the "xterm-*" variants, to exclude from the conversion (patch
-+	  by Robert Millan).
-+	+ add -lc_r as alternative for -lpthread, allows build of threaded code
-+	  in older FreeBSD machines.
-+	+ build-fix for MirBSD, which fails when either _XOPEN_SOURCE or
-+	  _POSIX_SOURCE are defined.
-+	+ fix a typo misc/Makefile.in, used in uninstalling pc-files.
-+
-+20111030
-+	+ modify make_db_path() to allow creating "terminfo.db" in the same
-+	  directory as an existing "terminfo" directory.  This fixes a case
-+	  where switching between hashed/filesystem databases would cause the
-+	  new hashed database to be installed in the next best location -
-+	  root's home directory.
-+	+ add variable cf_cv_prog_gnat_correct to those passed to
-+	  config.status, fixing a problem with Ada95 builds (cf: 20111022).
-+	+ change feature test from _XPG5 to _XOPEN_SOURCE in two places, to
-+	  accommodate broken implementations for _XPG6.
-+	+ eliminate usage of NULL symbol from etip.h, to reduce header
-+	  interdependencies.
-+	+ add configure check to decide when to add _XOPEN_SOURCE define to
-+	  compiler options, i.e., for Solaris 10 and later (cf: 20100403).
-+	  This is a workaround for gcc 4.6, which fails to build the c++
-+	  binding if that symbol is defined by the application, due to
-+	  incorrectly combining the corresponding feature test macros
-+	  (report by Peter Kruse).
-+
-+20111022
-+	+ correct logic for discarding mouse events, retaining the partial
-+	  events used to build up click, double-click, etc, until needed
-+	  (cf: 20110917).
-+	+ fix configure script to avoid creating unused Ada95 makefile when
-+	  gnat does not work.
-+	+ cleanup width-related gcc 3.4.3 warnings for 64-bit platform, for the
-+	  internal functions of libncurses.  The external interface of courses
-+	  uses bool, which still produces these warnings.
-+
-+20111015
-+	+ improve description of --disable-tic-depends option to make it
-+	  clear that it may be useful whether or not the --with-termlib
-+	  option is also given (report by Sven Joachim).
-+	+ amend termcap equivalent for set_pglen_inch to use the X/Open
-+	  "YI" rather than the obsolete Solaris 2.5 "sL" (cf: 990109).
-+	+ improve manpage for tgetent differences from termcap library.
-+
-+20111008
-+	+ moved static data from db_iterator.c to lib_data.c
-+	+ modify db_iterator.c for memory-leak checking, fix one leak.
-+	+ modify misc/gen-pkgconfig.in to use Requires.private for the parts
-+	  of ncurses rather than Requires, as well as Libs.private for the
-+	  other library dependencies (prompted by Debian #644728).
-+
-+20111001
-+	+ modify tic "-K" option to only set the strict-flag rather than force
-+	  source-output.  That allows the same flag to control the parser for
-+	  input and output of termcap source.
-+	+ modify _nc_getent() to ignore backslash at the end of a comment line,
-+	  making it consistent with ncurses' parser.
-+	+ restore a special-case check for directory needed to make termcap
-+	  text files load as if they were databases (cf: 20110924).
-+	+ modify tic's resolution/collision checking to attempt to remove the
-+	  conflicting alias from the second entry in the pair, which is
-+	  normally following in the source file.  Also improved the warning
-+	  message to make it simpler to see which alias is the problem.
-+	+ improve performance of the database iterator by caching search-list.
-+
-+20110925
-+	+ add a missing "else" in changes to _nc_read_tic_entry().
-+
-+20110924
-+	+ modify _nc_read_tic_entry() so that hashed-database is checked before
-+	  filesystem.
-+	+ updated CF_CURSES_LIBS check in test/configure script.
-+	+ modify configure script and makefiles to split TIC_ARGS and
-+	  TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables,
-+	  to help separate searches for tic- and tinfo-libraries (patch by Nick
-+	  Alcock aka "Nix").
-+	+ build-fix for lib_mouse.c changes (cf: 20110917).
-+
-+20110917
-+	+ fix compiler warning for clang 2.9
-+	+ improve merging of mouse events (integrated patch by Damien
-+	  Guibouret).
-+	+ correct mask-check used in lib_mouse for wheel mouse buttons 4/5
-+	  (patch by Damien Guibouret).
-+
-+20110910
-+	+ modify misc/gen_edit.sh to select a "linux" entry which works with
-+	  the current kernel rather than assuming it is always "linux3.0"
-+	  (cf: 20110716).
-+	+ revert a change to getmouse() which had the undesirable side-effect
-+	  of suppressing button-release events (report by Damien Guibouret,
-+	  cf: 20100102).
-+	+ add xterm+kbs fragment from xterm #272 -TD
-+	+ add configure option --with-pkg-config-libdir to provide control over
-+	  the actual directory into which pc-files are installed, do not use
-+	  the pkg-config environment variables (discussion with Frederic L W
-+	  Meunier).
-+	+ add link to mailing-list archive in announce.html.in, as done in
-+	  FAQ (prompted by question by Andrius Bentkus).
-+	+ improve manpage install by adjusting the "#include" examples to
-+	  show the ncurses-subdirectory used when --disable-overwrite option
-+	  is used.
-+	+ install an alias for "curses" to the ncurses manpage, tied to the
-+	  --with-curses-h configure option (suggested by Reuben Thomas).
-+
-+20110903
-+	+ propagate error-returns from wresize, i.e., the internal
-+	  increase_size and decrease_size functions through resize_term (report
-+	  by Tim van der Molen, cf:  20020713).
-+	+ fix typo in tset manpage (patch by Sven Joachim).
-+
-+20110820
-+	+ add a check to ensure that termcap files which might have "^?" do
-+	  not use the terminfo interpretation as "\177".
-+	+ minor cleanup of X-terminal emulator section of terminfo.src -TD
-+	+ add terminator entry -TD
-+	+ add simpleterm entry -TD
-+	+ improve wattr_get macros by ensuring that if the window pointer is
-+	  null, then the attribute and color values returned will be zero
-+	  (cf: 20110528).
-+
-+20110813
-+	+ add substitution for $RPATH_LIST to misc/ncurses-config.in
-+	+ improve performance of tic with hashed-database by caching the
-+	  database connection, using atexit() to cleanup.
-+	+ modify treatment of 2-character aliases at the beginning of termcap
-+	  entries so they are not counted in use-resolution, since these are
-+	  guaranteed to be unique.  Also ignore these aliases when reporting
-+	  the primary name of the entry (cf: 20040501)
-+	+ double-check gn (generic) flag in terminal descriptions to
-+	  accommodate old/buggy termcap databases which misused that feature.
-+	+ minor fixes to _nc_tgetent(), ensure buffer is initialized even on
-+	  error-return.
-+
-+20110807
-+	+ improve rpath fix from 20110730 by ensuring that the new $RPATH_LIST
-+	  variable is defined in the makefiles which use it.
-+	+ build-fix for DragonFlyBSD's pkgsrc in test/configure script.
-+	+ build-fixes for NetBSD 5.1 with termcap support enabled.
-+	+ corrected k9 in dg460-ansi, add other features based on manuals -TD
-+	+ improve trimming of whitespace at the end of terminfo/termcap output
-+	  from tic/infocmp.
-+	+ when writing termcap source, ensure that colons in the description
-+	  field are translated to a non-delimiter, i.e., "=".
-+	+ add "-0" option to tic/infocmp, to make the termcap/terminfo source
-+	  use a single line.
-+	+ add a null-pointer check when handling the $CC variable.
-+
-+20110730
-+	+ modify configure script and makefiles in c++ and progs to allow the
-+	  directory used for rpath option to be overridden, e.g., to work
-+	  around updates to the variables used by tic during an install.
-+	+ add -K option to tic/infocmp, to provide stricter BSD-compatibility
-+	  for termcap output.
-+	+ add _nc_strict_bsd variable in tic library which controls the
-+	  "strict" BSD termcap compatibility from 20110723, plus these
-+	  features:
-+	  + allow escapes such as "\8" and "\9" when reading termcap
-+	  + disallow "\a", "\e", "\l", "\s" and "\:" escapes when reading
-+	    termcap files, passing through "a", "e", etc.
-+	  + expand "\:" as "\072" on output.
-+	+ modify _nc_get_token() to reset the token's string value in case
-+	  there is a string-typed token lacking the "=" marker.
-+	+ fix a few memory leaks in _nc_tgetent.
-+	+ fix a few places where reading from a termcap file could refer to
-+	  freed memory.
-+	+ add an overflow check when converting terminfo/termcap numeric
-+	  values, since terminfo stores those in a short, and they must be
-+	  positive.
-+	+ correct internal variables used for translating to termcap "%>"
-+	  feature, and translating from termcap %B to terminfo, needed by
-+	  tctest (cf: 19991211).
-+	+ amend a minor fix to acsc when loading a termcap file to separate it
-+	  from warnings needed for tic (cf: 20040710)
-+	+ modify logic in _nc_read_entry() and _nc_read_tic_entry() to allow
-+	  a termcap file to be handled via TERMINFO_DIRS.
-+	+ modify _nc_infotocap() to include non-mandatory padding when
-+	  translating to termcap.
-+	+ modify _nc_read_termcap_entry(), passing a flag in the case where
-+	  getcap is used, to reduce interactive warning messages.
-+
-+20110723
-+	+ add a check in start_color() to limit color-pairs to 256 when
-+	  extended colors are not supported (patch by David Benjamin).
-+	+ modify setcchar to omit no-longer-needed OR'ing of color pair in
-+	  the SetAttr() macro (patch by David Benjamin).
-+	+ add kich1 to sun terminfo entry (Yuri Pankov)
-+	+ use bold rather than reverse for smso in sun-color terminfo entry
-+	  (Yuri Pankov).
-+	+ improve generation of termcap using tic/infocmp -C option, e.g.,
-+	  to correspond with 4.2BSD (prompted by discussion with Yuri Pankov
-+	  regarding Schilling's test program):
-+	  + translate %02 and %03 to %2 and %3 respectively.
-+	  + suppress string capabilities which use %s, not supported by tgoto
-+	  + use \040 rather than \s
-+	  + expand null characters as \200 rather than \0
-+	+ modify configure script to support shared libraries for DragonFlyBSD.
-+
-+20110716
-+	+ replace an assert() in _nc_Free_Argument() with a regular null
-+	  pointer check (report/analysis by Franjo Ivancic).
-+	+ modify configure --enable-pc-files option to take into account the
-+	  PKG_CONFIG_PATH variable (report by Frederic L W Meunier).
-+	+ add/use xterm+tmux chunk from xterm #271 -TD
-+	+ resync xterm-new entry from xterm #271 -TD
-+	+ add E3 extended capability to linux-basic (Miroslav Lichvar)
-+	+ add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD
-+	+ add SI/SO change to linux2.6 entry (Debian #515609) -TD
-+	+ fix inconsistent tabset path in pcmw (Todd C. Miller).
-+	+ remove a backslash which continued comment, obscuring altos3
-+	  definition with OpenBSD toolset (Nicholas Marriott).
-+
-+20110702
-+	+ add workaround from xterm #271 changes to ensure that compiler flags
-+	  are not used in the $CC variable.
-+	+ improve support for shared libraries, tested with AIX 5.3, 6.1 and
-+	  7.1 with both gcc 4.2.4 and cc.
-+	+ modify configure checks for AIX to include release 7.x
-+	+ add loader flags/libraries to libtool options so that dynamic loading
-+	  works properly, adapted from ncurses-5.7-ldflags-with-libtool.patch
-+	  at gentoo prefix repository (patch by Michael Haubenwallner).
-+
-+20110626
-+	+ move include of nc_termios.h out of term_entry.h, since the latter
-+	  is installed, e.g., for tack while the former is not (report by
-+	  Sven Joachim).
-+
-+20110625
-+	+ improve cleanup() function in lib_tstp.c, using _exit() rather than
-+	  exit() and checking for SIGTERM rather than SIGQUIT (prompted by
-+	  comments forwarded by Nicholas Marriott).
-+	+ reduce name pollution from term.h, moving fallback #define's for
-+	  tcgetattr(), etc., to new private header nc_termios.h (report by
-+	  Sergio NNX).
-+	+ two minor fixes for tracing (patch by Vassili Courzakis).
-+	+ improve trace initialization by starting it in use_env() and
-+	  ripoffline().
-+	+ review old email, add details for some changelog entries.
-+
-+20110611
-+	+ update minix entry to minix 3.2 (Thomas Cort).
-+	+ fix a strict compiler warning in change to wattr_get (cf: 20110528).
-+
-+20110604
-+	+ fixes for MirBSD port:
-+	  + set default prefix to /usr.
-+	  + add support for shared libraries in configure script.
-+	  + use S_ISREG and S_ISDIR consistently, with fallback definitions.
-+	+ add a few more checks based on ncurses/link_test.
-+	+ modify MKlib_gen.sh to handle sp-funcs renaming of NCURSES_OUTC type.
-+
-+20110528
-+	+ add case to CF_SHARED_OPTS for Interix (patch by Markus Duft).
-+	+ used ncurses/link_test to check for behavior when the terminal has
-+	  not been initialized and when an application passes null pointers
-+	  to the library.  Added checks to cover this (prompted by Redhat
-+	  #707344).
-+	+ modify MKlib_gen.sh to make its main() function call each function
-+	  with zero parameters, to help find inconsistent checking for null
-+	  pointers, etc.
-+
-+20110521
-+	+ fix warnings from clang 2.7 "--analyze"
-+
-+20110514
-+	+ compiler-warning fixes in panel and progs.
-+	+ modify CF_PKG_CONFIG macro, from changes to tin -TD
-+	+ modify CF_CURSES_FUNCS configure macro, used in test directory
-+	  configure script:
-+	  + work around (non-optimizer) bug in gcc 4.2.1 which caused
-+	    test-expression to be omitted from executable.
-+	  + force the linker to see a link-time expression of a symbol, to
-+	    help work around weak-symbol issues.
-+
-+20110507
-+	+ update discussion of MKfallback.sh script in INSTALL; normally the
-+	  script is used automatically via the configured makefiles.  However
-+	  there are still occasions when it might be used directly by packagers
-+	  (report by Gunter Schaffler).
-+	+ modify misc/ncurses-config.in to omit the "-L" option from the
-+	  "--libs" output if the library directory is /usr/lib.
-+	+ change order of tests for curses.h versus ncurses.h headers in the
-+	  configure scripts for Ada95 and test-directories, to look for
-+	  ncurses.h, from fixes to tin -TD
-+	+ modify ncurses/tinfo/access.c to account for Tandem's root uid
-+	  (report by Joachim Schmitz).
-+
-+20110430
-+	+ modify rules in Ada95/src/Makefile.in to ensure that the PIC option
-+	  is not used when building a static library (report by Nicolas
-+	  Boulenguez):
-+	+ Ada95 build-fix for big-endian architectures such as sparc.  This
-+	  undoes one of the fixes from 20110319, which added an "Unused" member
-+	  to representation clauses, replacing that with pragmas to suppress
-+	  warnings about unused bits (patch by Nicolas Boulenguez):
-+
-+20110423
-+	+ add check in test/configure for use_window, use_screen.
-+	+ add configure-checks for getopt's variables, which may be declared
-+	  as different types on some Unix systems.
-+	+ add check in test/configure for some legacy curses types of the
-+	  function pointer passed to tputs().
-+	+ modify init_pair() to accept -1's for color value after
-+	  assume_default_colors() has been called (Debian #337095).
-+	+ modify test/background.c, adding commmand-line options to demonstrate
-+	  assume_default_colors() and use_default_colors().
-+
-+20110416
-+	+ modify configure script/source-code to only define _POSIX_SOURCE if
-+	  the checks for sigaction and/or termios fail, and if _POSIX_C_SOURCE
-+	  and _XOPEN_SOURCE are undefined (report by Valentin Ochs).
-+	+ update config.guess, config.sub
-+
-+20110409
-+	+ fixes to build c++ binding with clang 3.0 (patch by Alexander
-+	  Kolesen).
-+	+ add check for unctrl.h in test/configure, to work around breakage in
-+	  some ncurses packages.
-+	+ add "--disable-widec" option to test/configure script.
-+	+ add "--with-curses-colr" and "--with-curses-5lib" options to the
-+	  test/configure script to address testing with very old machines.
-+
- 20110404 5.9 release for upload to ftp.gnu.org
- 
- 20110402
-@@ -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.
- 	+ use _tracef() in show_where() function of tic, to work correctly with
--	  special case of trace configuration. 
-+	  special case of trace configuration.
- 
- 20110205
- 	+ add xterm-utf8 entry as a demo of the U8 feature -TD
-@@ -219,7 +944,7 @@
- 	  version which works with termcap.
- 	+ remove obsolete emacs "Local Variables" section from documentation
- 	  (request by Sven Joachim).
--	+ update doc/html/index.html to include NCURSES-Programming-HOWTO.html 
-+	+ update doc/html/index.html to include NCURSES-Programming-HOWTO.html
- 	  (report by Sven Joachim).
- 
- 20101128
-@@ -294,8 +1019,8 @@
- 	  Sven Joachim).
- 	+ add parameterized cursor-controls to linux-basic (report by Dae) -TD
- 	> patch by Juergen Pfeifer:
--	+ document how to build 32-bit libraries in README.MinGW 
--	+ fixes to filename computation in mk-dlls.sh.in 
-+	+ document how to build 32-bit libraries in README.MinGW
-+	+ fixes to filename computation in mk-dlls.sh.in
- 	+ use POSIX locale in mk-dlls.sh.in rather than en_US (report by Sven
- 	  Joachim).
- 	+ add a check in mk-dlls.sh.in to obtain the size of a pointer to
-@@ -478,7 +1203,7 @@
- 20100417
- 	+ modify _nc_capcmp() to work with cancelled strings.
- 	+ correct translation of "^" in _nc_infotocap(), used to transform
--	  terminfo to termcap strings 
-+	  terminfo to termcap strings
- 	+ add configure --disable-rpath-hack, to allow disabling the feature
- 	  which adds rpath options for libraries in unusual places.
- 	+ improve CF_RPATH_HACK_2 by checking if the rpath option for a given
-@@ -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):
- 	+ re-add _nc_hash_map
--	+ modify EmitRange to maintain position as per original design.
--	+ add hashtest.c, program to time the hashmap optimization.
-+	+ modify EmitRange to maintain position as per original design
-+	  (patch by A. Lukyanov).
-+	+ modify test/ncurses.c and tputs, etc., to allow trace counting
-+	  output characters.
-+	+ add hashtest.c program to time the hashmap optimization.
- 	> patch 316 (ESR):
- 	+ add logic to deal with magic-cookie (how was this tested?)
- 	  (lib_doupdate.c).
- 	+ add ncurses.c driver for magic-cookie, some fixes to ncurses.c
- 	> patch 315 (ESR):
--	+ merged Alexander V Lukyanov's patch to use ech and rep - untested
--	  (lib_doupdate.c).
-+	+ merge changes to lib_doupdate.c to use ech and rep - untested
-+	  (patch by Alexander V Lukyanov).
- 	+ modified handling of interrupted system calls - untested
- 	  (lib_getch.c, lib_twait.c).
- 	+ new function _nc_mvcur_resume()
-@@ -9059,12 +9787,12 @@
- 	+ corrected typo in dtterm description.
- 	> patch 313 (ESR):
- 	+ add dtterm description
--	+ clarify ncurses 'i' test (drop vscanf subtest)
-+	+ clarify ncurses 'i' test (drop mvwscanw subtest)
- 
- 960810	- snapshot
- 	+ correct nl()/nonl() to work as per SVr4 & XSI.
- 	+ 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
- 	> patch 311 (ESR):
--	+ fix idlok() and idcok() and the default of the idlok switch.
-+	+ fix idlok() and idcok() and the default of the idlok switch (report
-+	  by Ville Sulko).
- 
- 960803	- snapshot
- 	+ corrected tparm to handle capability strings without explicit pop
-@@ -9083,7 +9812,7 @@
- 	> patch 310 (ESR):
- 	+ documentation and prototyping errors for has_color, immedok and idcok
- 	  (reported by William P Setzer <wsetzer@pams.ncsu.edu>)
--	+ updated qnx terminfo entry (by Michael Hunter)
-+	+ updated qnx terminfo entry (patch by Michael Hunter)
- 
- 960730
- 	+ eliminate quoted includes in ncurses subdirectory, ensure config.h
-@@ -9095,7 +9824,7 @@
- 	+ call cbreak() in initscr(), as per XSI & SVr4.
- 	+ turn off hardware echo in initscr() as per XSI & SVr4
- 	> patch 309 (ESR):
--	+ terminfo changes (9.3.10), from BRL
-+	+ terminfo changes (9.3.9), from BRL
- 	+ add more checks to terminfo parser.
- 	+ add more symbols to infocmp.
- 
-@@ -9114,6 +9843,7 @@
- 	> patch 308 (ESR):
- 	+ terminfo changes (9.3.8)
- 	+ modified logic of error-reporting in terminfo parser
-+	+ fix option-processing bug in toe.
- 
- 960713	- snapshot
- 	+ always check for <sys/bsdtypes.h> since ISC needs it to declare
-@@ -9122,9 +9852,19 @@
- 	  by Juergen Pfeifer, Mike Long)
- 	+ add LOCAL_LDFLAGS2 symbol (Juergen Pfeifer)
- 	+ corrected prototype for delay_output() -- bump ABI to 3.2
--	+ terminfo patches #306/307 (ESR).
-+	+ patch 307 (ESR):
-+	+ enable more translations of nonstandard caps, and document them.
-+	+ misc/terminfo.src update to 9.13.8
-+	+ patch 306 (ESR):
- 	+ moved logic that filters out rmul and rmso from setupterm to newterm
- 	  where it is less likely to interfere with termcap applications.
-+	+ cosmetic fixes to test/ncurses.c
-+	+ modify open() call in ncurses/read_entry.c to use O_RDONLY symbol
-+	  rather than constant (report by mib).
-+	+ misc/terminfo.src sgr0 and acsc changes (report by Philippe De
-+	  Muyter).
-+	+ modify ncurses/comp_parse.c so that entries containing a "+" can
-+	  have missing rmcup vs smcup.
- 
- 960707
- 	+ rollback ESR's #305 change to terminfo.src (it breaks existing
-@@ -9139,7 +9879,6 @@
- 	+ make lib_vidattr.c more readable using macros.
- 	+ filter out rmul, rmso that conflict with sgr0 when reading terminal
- 	  descriptions.
--	+ added sanity-checking of various paired string attributes (ESR).
- 	+ work around autoconf bug, force $INSTALL to absolute path
- 	  (reported by Zeyd).
- 	+ modify man-page install for BSDI to install preformatted .0 files
-@@ -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
- 	  of the screen.
-+	> patch 305 (ESR):
-+	+ added sanity-checking of various paired string attributes.
-+	+ misc/terminfo.src update to 9.13.7 (report by A. Lukyanov).
-+	+ modify man/Makefile.in to make terminfo.5 during normal build.
-+	> patch 304 (ESR):
-+	+ corrected allocation-length for $HOME/.terminfo path.
- 
- 960629	- snapshot
- 	+ check return code of _nc_mvcur_scrolln() in _nc_scroll_optimize() for
-@@ -9234,6 +9979,7 @@
- 	+ better fix for nvi refresh-bug (Rick Marshall)
- 	+ fix for bug in handling of interrupted keystroke waits,
- 	  (Werner Fleck).
-+	+ misc/ncurses-intro.html syntax fix (Kajiyama Tamito).
- 
- 960601	- snapshot
- 	+ auto-configure man-page compression-format and renames for Debian.
-@@ -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)
- 	+ fixes for menus & forms (Juergen Pfeifer)
-+	> patch 302 (ESR):
-+	+ improve hash function (suggested by Alexander V Lukyanov).
-+	+ 9.13.4 update for terminfo.src
- 
- 960518	- snapshot
- 	+ revised ncurses.c panner test, let pad abut all 4 sides of screen.
-@@ -9275,6 +10024,8 @@
- 	  confusion, and made this check for the /usr/lib/terminfo pre-existing
- 	  directory.
- 	> patches 299-301 (ESR):
-+	+ html fixes (Phillippe de Muyter).
-+	+ fix typo in ncurses-intro.html (report by Fabrizio Polacco).
- 	+ added hashmap.c
- 	+ mods to tracing, especially for ACS chars.
- 	+ corrected off-by-one in IDCtransform.
-@@ -9294,13 +10045,21 @@
- 	> patches 297, 298 (ESR):
- 	+ implement TERMINFO_DIRS, and -o option of tic
- 	+ added TRACE_IEVENT
--	+ removed boolean version of 'getm'
--	+ added lib_print.c (for Rick Marshall)
--	+ added has_key()
-+	+ fix REQ_TOGGLE_ITEM in menu/menu_driver.c; it could select but not
-+	  deselect.
-+	+ added lib_print.c (request by Rick Marshall).
-+	+ added has_key() (request by Juergen Pfeifer).
-+	+ do not issue clrtoeol or clrtobot if the relevant portion of the line
-+	  is already blank (analysis by Keith Bostic).
-+	+ add parentheses for parameters of COLOR_PAIR and PAIR_NUMBER macros
-+	  (analysis by Jurgen Eidt).
-+	+ update screen's notion of cursor position in endwin() (analysis by
-+	  Alexander Lukyanov).
- 	+ added 't' to ncurses.c test.
- 	+ moved delay_output() to lib_tputs.c
- 	+ removed tparam() (was added in 1.9.9, but conflicts with emacs and
- 	  is not part of X/Open Curses).
-+	+ removed boolean version of 'getm'.
- 	+ misc cursor & optimization fixes.
- 
- 960504	- snapshot
-@@ -9326,11 +10085,20 @@
- 	+ make TIOCGWINSZ configure test less stringent, in case user
- 	  configures via terminal that cannot get screen size.
- 	> patches 295, 296 (ESR):
--	+ new "-e" option of tic.
--	+ fix for "infocmp -e".
--	+ restore working-directory in read_termcap.c
- 	+ split lib_kernel.c, lib_setup.c and names.c in order to reduce
- 	  overhead for programs that use only termcap features.
-+	+ new "-e" and "-h" options of tic (request by Tony Nugent).
-+	+ fix bug in mandatory-delay logic in lib_tputs.c (report by Sven
-+	  Verdoolaege).
-+	+ fix for "infocmp -e" to emit correct initializers (reported by Manual
-+	  J Novoa III).
-+	+ restore working-directory in read_termcap.c (report by Kayvan
-+	  Sylvan).
-+	+ use "-h" option on Solaris when generating shared libraries on
-+	  Solaris 2.5 to record the library name in the file, for assisting
-+	  the loader (patch by Scott Kramer).
-+	+ undo patch #294 changes to form and menu libraries (request by
-+	  Juergen Pfeifer).
- 
- 960418	- snapshot
- 	+ use autoconf 2.9
-@@ -9338,10 +10106,22 @@
- 	  definitions via <termios.h>, modified macros in lib_raw.c to avoid
- 	  K&R-style substitution)
- 	> patches 293, 294 (ESR):
--	+ mods to wgetch() in cooked mode
--	+ corrected askuser() logic in tset
--	+ correct interaction of endwin() with mouse processing
-+	+ rewrite wsyncup(), wsyncdown(), as well as small fixes to form and
-+	  menu libraries to fix echo-breakage introduced by 1.8.9, 1.9.9e
-+	  changes (patches by Juergen Pfeifer).
-+	+ fix compile under QNX 4.2 by defining ONLCR in lib_raw.c when
-+	  __QNX__ is defined (patch by Michael Hunter).
-+	+ modify setupterm() to match documentation for its return value, fix
-+	  newterm to work with this change (report by Emmet Lazich).
-+	+ add checks in getch() for error, return ERR as appropriate (report by
-+	  Emmet Lazich).
-+	+ mods to wgetch() in cooked mode (report by Pete Seebach).
-+	+ corrected askuser() logic in tset (patch by Remco Treffkorn).
-+	+ correct interaction of endwin() with mouse processing (report by
-+	  Michael Elkins).
- 	+ added trace support for TTY flags
-+	+ update terminfo.src to 9.13.1
-+	+ FreeBSD console entries (patch by Andrew Chernov).
- 
- 960406
- 	+ 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-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-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             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README,v 1.23 2006/04/22 22:19:37 tom Exp $
-+-- $Id: README,v 1.25 2012/08/11 20:11:26 tom Exp $
- -------------------------------------------------------------------------------
- 		README file for the ncurses package
- 
-@@ -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,
- 	the wresize, default colors and key definition extensions and numerous
--	bug fixes (more than half of those enumerated in NEWS beginning with
--	the internal release 1.8.9).
-+	bug fixes -- more than half of those enumerated in NEWS beginning with
-+	the internal release 1.8.9, see
-+
-+		http://invisible-island.net/personal/changelogs.html
- 
- Florian La Roche (official maintainer for FSF's ncurses 4.2)
- 	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-08-25 19:57:59.419900852 +0000
-+++ ncurses-5.9/README.MinGW	2012-08-25 19:58:00.359896408 +0000
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- 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   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README.MinGW,v 1.5 2011/02/26 16:57:17 tom Exp $
-+-- $Id: README.MinGW,v 1.8 2012/01/21 23:55:33 tom Exp $
- -- Author: Juergen Pfeifer
- -------------------------------------------------------------------------------
- 
-@@ -39,7 +39,7 @@
- To build ncurses for native Windows, you need the MinGW toolchain.  The
- original MinGW toolchain from the above site is only for 32-Bit Windows.  As
- Windows Server - and also regular workstations - are moving to 64-Bit, it
--seems to be reasonable to have a toolchain that supports both architectures. 
-+seems to be reasonable to have a toolchain that supports both architectures.
- I recommend to use the TDM gcc toolchain which you can find at
- http://tdm-gcc.tdragon.net/download.  Go to the download section and select
- the bundle installer for tdm64 (MinGW-w64).  This installs a multilib version
-@@ -47,7 +47,7 @@
- versions.  It also comes with a working pthread implementation.
- 
- The latest config and build scripts we use for MinGW have only been tested
--for the gcc-4.4 compiler toolchain (or better).
-+for the gcc-4.6.1 compiler toolchain (or better).
- 
- Using MinGW is a pragmatic decision, it's the easiest way to port this
- heavily UNIX based sourcebase to native Windows. The goal is of course
-@@ -55,22 +55,12 @@
- common traditional development environments on Windows, mainly with
- Microsoft Visual Studio.
- 
--If you start a bash from the MSYS environment, please make sure that the
--Microsoft Development tools are in your PATH right after the MinGW
--tools. The LIB.EXE tool is the only one needed. You need this only if 
--you want to build DLLs that work with native Windows programs. If you 
--don't have any Microsoft  Development tools on your machine, consider 
--at least to get the free "Visual C++ 2010 Express Edition". 
--It contains the LIB.EXE tool. You may also use this compiler to test 
--writing native Windows programs using the ncurses DLLs without using 
--MinGW then for writing apps.
--
- It is necessary to unset the TERM environment variable, to activate the
- Windows console-driver.
- 
- Please also make sure that MSYS links to the correct directory containing
- your MinGW toolchain. For TDM this is usually C:\MinGW64. In your Windows
--CMD.EXE command shell go to the MSYS root directory (most probably 
-+CMD.EXE command shell go to the MSYS root directory (most probably
- C:\MSYS or C:\MSYS\1.0) and verify, that there is a junction point mingw
- that points to the MinGW toolchain directory. If not, delete the mingw
- directory and use the mklink command (or the linkd.exe utility on older
-@@ -79,58 +69,54 @@
- This code requires WindowsNT 5.1 or better, which means on the client
- Windows XP or better, on the server Windows Server 2003 or better.
- 
--In order to build ncurses for the planned interop layer with .NET, we
--recommend to use these options with configure
-+I recommend using libtool to build ncurses on MinGW, because libtool
-+knows exactly how to build dll's on Windows for use with MinGW.
-+
-+To build a modern but still small footprint ncurses that provides
-+hooks for interop, I recommend using these options:
- 
-+	  --with-libtool
- 	  --disable-home-terminfo
--	  --enable-reentrant
-+	  --enable-database
-+	  --disable-termcap
- 	  --enable-sp-funcs
- 	  --enable-term-driver
- 	  --enable-interop
--	  --with-pthread         (if using TDM toolchain as recommended)
- 
--This is the configuration commandline as I'm using it at the moment:
-+This is the configuration commandline as I'm using it at the moment (assuming environment variable MINGW_ROOT to hold the root directory name of your MinGW build):
- 
- ./configure \
--	--prefix=/mingw \
--	--without-cxx-binding \
-+	--prefix=$MINGW_ROOT \
-+	--with-cxx \
- 	--without-ada \
- 	--enable-warnings \
- 	--enable-assertions \
--	--enable-reentrant \
--	--with-debug \
--	--with-normal \
- 	--disable-home-terminfo \
-+	--enable-database \
- 	--enable-sp-funcs \
- 	--enable-term-driver \
- 	--enable-interop \
--	--with-pthread
-+	--disable-termcap \
-+	--with-progs \
-+	--with-libtool \
-+	--enable-pc-files \
-+	--mandir=$MINGW_ROOT/share/man
- 
--If you are on a 64-Bit Windows system and want to build a 32-Bit version
--of ncurses, you may use this commandline for configuration (when using
--the TDM toolchain):
--
--CC="gcc -m32" LD="ld -m32" ./configure \
--	--prefix=/mingw \
--	--without-cxx-binding \
--	--without-ada \
--	--enable-warnings \
--	--enable-assertions \
--	--enable-reentrant \
--	--with-debug \
--	--with-normal \
--	--disable-home-terminfo \
--	--enable-sp-funcs \
--	--enable-term-driver \
--	--enable-interop \
--	--with-pthread
-+Please note that it is also necessary to set this environment variable:
- 
--All the options above are - like the whole Windows support -
--experimental.
-+export PATH_SEPARATOR=";"
-+
-+in order to parse the terminfo paths correctly. Terminfo paths should
-+always be separated by a seeeemicolon,even when running under MSYS.
- 
--In order to build the DLLs, after your regular make you must call
-+To support regular expressions properly, ncurses under MinGW should be
-+linked against the gnurx regex library, which must be built separately
-+under MinGW.  See
- 
--   make dlls
-+    ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libgnurx-src-2.5.zip
-+
-+All the options above are - like the whole Windows support -
-+experimental.
- 
- A lot is still TODO, e.g.:
- 
-diff -Naur ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4
---- 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***************************************************************************
--dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 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
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -62,6 +62,31 @@
-   fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03
-+dnl ------------------
-+dnl Conditionally generate script according to whether we're using a given autoconf.
-+dnl
-+dnl $1 = version to compare against
-+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
-+dnl $3 = code to use if AC_ACVERSION is older than $1.
-+define(CF_ACVERSION_CHECK,
-+[
-+ifdef([m4_version_compare],
-+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
-+[CF_ACVERSION_COMPARE(
-+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
-+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50
-+dnl --------------------
-+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
-+dnl                      MAJOR2, MINOR2, TERNARY2,
-+dnl                      PRINTABLE2, not FOUND, FOUND)
-+define(CF_ACVERSION_COMPARE,
-+[ifelse(builtin([eval], [$2 < $5]), 1,
-+[ifelse([$8], , ,[$8])],
-+[ifelse([$9], , ,[$9])])])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
- dnl -------------------
- dnl Construct the list of include-options for the C programs in the Ada95
-@@ -313,12 +338,33 @@
- }
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
-+dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45
- dnl ----------------
--dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
--dnl in the sharutils 4.2 distribution.
-+dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
-+dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
- AC_DEFUN([CF_ANSI_CC_CHECK],
- [
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+# into CC.  This will not help with broken scripts that wrap the compiler with
-+# options, but eliminates a more common category of user confusion.
-+AC_MSG_CHECKING(\$CC variable)
-+case "$CC" in #(vi
-+*[[\ \	]]-[[IUD]]*)
-+	AC_MSG_RESULT(broken)
-+	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
-+	# humor him...
-+	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
-+	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
-+	CF_ADD_CFLAGS($cf_flags)
-+	;;
-+*)
-+	AC_MSG_RESULT(ok)
-+	;;
-+esac
-+
- AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
- cf_cv_ansi_cc=no
- cf_save_CFLAGS="$CFLAGS"
-@@ -465,7 +511,7 @@
- AC_SUBST(ARFLAGS)
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
-+dnl CF_AWK_BIG_PRINTF version: 4 updated: 2011/10/30 17:09:50
- dnl -----------------
- dnl Check if awk can handle big strings using printf.  Some older versions of
- dnl awk choke on large strings passed via "%s".
-@@ -479,8 +525,8 @@
- 		eval $2=no
- 		;;
- 	*) #(vi
--		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
--			| $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
-+		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \
-+			| $AWK '{ printf "%d\n", length([$]0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
- 			eval $2=yes
- 		else
- 			eval $2=no
-@@ -695,7 +741,7 @@
- AC_SUBST(BUILD_OBJEXT)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00
-+dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13
- dnl ---------------
- dnl Determine the default configuration into which we'll install ncurses.  This
- dnl can be overridden by the user's command-line options.  There's two items to
-@@ -713,7 +759,7 @@
- if test "x$prefix" = "xNONE" ; then
- 	case "$cf_cv_system_name" in
- 		# non-vendor systems don't have a conflict
--	openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu)
-+	openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu)
- 		prefix=/usr
- 		;;
- 	*)	prefix=$ac_default_prefix
-@@ -749,27 +795,48 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52
-+dnl CF_CGETENT version: 4 updated: 2011/08/07 14:54:41
- dnl ----------
- dnl Check if the terminal-capability database functions are available.  If not,
- dnl ncurses has a much-reduced version.
- AC_DEFUN([CF_CGETENT],[
--AC_MSG_CHECKING(for terminal-capability database functions)
--AC_CACHE_VAL(cf_cv_cgetent,[
-+AC_CACHE_CHECK(for terminal-capability database functions,cf_cv_cgetent,[
- AC_TRY_LINK([
- #include <stdlib.h>],[
- 	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");
- 	],
- 	[cf_cv_cgetent=yes],
- 	[cf_cv_cgetent=no])
- ])
--AC_MSG_RESULT($cf_cv_cgetent)
--test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT)
-+
-+if test "$cf_cv_cgetent" = yes
-+then
-+	AC_DEFINE(HAVE_BSD_CGETENT)
-+AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[
-+AC_TRY_LINK([
-+#include <stdlib.h>],[
-+	char temp[128];
-+	char *buf = temp;
-+#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");
-+	],
-+	[cf_cv_cgetent_const=yes],
-+	[cf_cv_cgetent_const=no])
-+])
-+	if test "$cf_cv_cgetent_const" = yes
-+	then
-+		AC_DEFINE_UNQUOTED(CGETENT_CONST,const)
-+	fi
-+fi
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
-@@ -908,7 +975,61 @@
- fi
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18
-+dnl CF_CHECK_WCHAR_H version: 1 updated: 2011/10/29 15:01:05
-+dnl ----------------
-+dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
-+AC_DEFUN([CF_CHECK_WCHAR_H],[
-+AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[
-+AC_TRY_COMPILE(
-+[
-+#include <stdlib.h>
-+#include <wchar.h>
-+],[
-+	wint_t foo = 0;
-+	int bar = iswpunct(foo)],
-+	[cf_cv_wchar_h_okay=yes],
-+	[cf_cv_wchar_h_okay=no])])
-+
-+if test $cf_cv_wchar_h_okay = no
-+then
-+	CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
-+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_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 +1053,7 @@
- {
- 	value = x;
- }
--void main() { }
-+int main() { }
- ],
- 	[cf_cv_cpp_param_init=yes],
- 	[cf_cv_cpp_param_init=no],
-@@ -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 ---------------
-+dnl Setup special archiver flags for given compilers.
-+AC_DEFUN([CF_CXX_AR_FLAGS],[
-+	CXX_AR='$(AR)'
-+	CXX_ARFLAGS='$(ARFLAGS)'
-+	case $cf_cv_system_name in #(vi
-+	irix*) #(vi
-+	    if test "$GXX" != yes ; then
-+		CXX_AR='$(CXX)'
-+		CXX_ARFLAGS='-ar -o'
-+	    fi
-+	    ;;
-+	sco3.2v5*) #(vi
-+	    CXXLDFLAGS="-u main"
-+	    ;;
-+	solaris2*)
-+	    if test "$GXX" != yes ; then
-+		CXX_AR='$(CXX)'
-+		CXX_ARFLAGS='-xar -o'
-+	    fi
-+	    ;;
-+	esac
-+	AC_SUBST(CXXLDFLAGS)
-+	AC_SUBST(CXX_AR)
-+	AC_SUBST(CXX_ARFLAGS)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_CXX_IOSTREAM_NAMESPACE version: 1 updated: 2011/10/29 08:35:34
-+dnl -------------------------
-+dnl For c++, check if iostream uses "std::" namespace.
-+AC_DEFUN([CF_CXX_IOSTREAM_NAMESPACE],[
-+AC_CHECK_HEADERS(iostream)
-+if test x"$ac_cv_header_iostream" = xyes ; then
-+	AC_MSG_CHECKING(if iostream uses std-namespace)
-+	AC_TRY_COMPILE([
-+#include <iostream>
-+using std::endl;
-+using std::cerr;],[
-+cerr << "testing" << endl;
-+],[cf_iostream_namespace=yes],[cf_iostream_namespace=no])
-+	AC_MSG_RESULT($cf_iostream_namespace)
-+	if test "$cf_iostream_namespace" = yes ; then
-+		AC_DEFINE(IOSTREAM_NAMESPACE)
-+	fi
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39
- dnl -----------
- dnl Check if the C compiler supports "inline".
- 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: 9 updated: 2012/08/04 13:59:54
-+dnl ------------------
-+dnl This is the "--enable-pc-files" option, which is available if there is a
-+dnl pkg-config configuration on the local machine.
-+AC_DEFUN([CF_ENABLE_PC_FILES],[
-+AC_REQUIRE([CF_PKG_CONFIG])
-+AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
-+
-+if test "$PKG_CONFIG" != none ; 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)
-+	if test "$enable_pc_files" != no
-+	then
-+		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
-+	fi
-+else
-+	enable_pc_files=no
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42
- dnl ---------------
- dnl Check if the rpath option should be used, setting cache variable
-@@ -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: 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 +1418,17 @@
- AC_MSG_CHECKING(for special defines needed for etip.h)
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-+
-+# etip.h includes ncurses.h which includes ncurses_dll.h
-+# But ncurses_dll.h is generated - fix here.
-+test -d include || mkdir include
-+test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
-+
- for cf_math in "" MATH_H
- do
- for cf_excp in "" MATH_EXCEPTION
- do
--	CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include"
-+	CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- AC_TRY_COMPILE([
-@@ -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
- dnl ---------------------------------------------------------------------------
-+dnl CF_GETOPT_HEADER version: 4 updated: 2009/08/31 20:07:52
-+dnl ----------------
-+dnl Check for getopt's variables which are commonly defined in stdlib.h,
-+dnl unistd.h or (nonstandard) in getopt.h
-+AC_DEFUN([CF_GETOPT_HEADER],
-+[
-+AC_HAVE_HEADERS(unistd.h getopt.h)
-+AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
-+cf_cv_getopt_header=none
-+for cf_header in stdio.h stdlib.h unistd.h getopt.h
-+do
-+AC_TRY_COMPILE([
-+#include <$cf_header>],
-+[int x = optind; char *y = optarg],
-+[cf_cv_getopt_header=$cf_header
-+ break])
-+done
-+])
-+if test $cf_cv_getopt_header != none ; then
-+	AC_DEFINE(HAVE_GETOPT_HEADER)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41
- dnl ----------------
- AC_DEFUN([CF_GNAT_GENERICS],
-@@ -2040,7 +2386,7 @@
- rm -rf conftest* *~conftest*
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41
-+dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10
- dnl ---------------
- dnl Verify version of GNAT.
- AC_DEFUN([CF_GNAT_VERSION],
-@@ -2052,7 +2398,7 @@
- AC_MSG_RESULT($cf_gnat_version)
- 
- case $cf_gnat_version in #(vi
--3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi
-+3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- *)
-@@ -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 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LDFLAGS_STATIC version: 8 updated: 2010/10/23 14:39:56
-+dnl CF_LDFLAGS_STATIC version: 10 updated: 2011/09/24 12:51:48
- dnl -----------------
- dnl Check for compiler/linker flags used to temporarily force usage of static
- dnl libraries.  This depends on the compiler and platform.  Use this to help
-@@ -2602,7 +2949,7 @@
-     esac
- else
- 	case $cf_cv_system_name in #(
--	aix[[456]]*) 	#( from ld manpage
-+	aix[[4-7]]*) 	#( from ld manpage
- 		LDFLAGS_STATIC=-bstatic
- 		LDFLAGS_SHARED=-bdynamic
- 		;;
-@@ -2652,7 +2999,17 @@
- int cf_ldflags_static(FILE *fp);
- ],[
- 	return cf_ldflags_static(stdin);
--],[cf_ldflags_static=yes],[cf_ldflags_static=no])
-+],[
-+	# some linkers simply ignore the -dynamic
-+	case x`file conftest$ac_exeext 2>/dev/null` in #(vi
-+	*static*) # (vi
-+		cf_ldflags_static=no
-+		;;
-+	*)
-+		cf_ldflags_static=yes
-+		;;
-+	esac
-+],[cf_ldflags_static=no])
- 
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
-@@ -2673,7 +3030,7 @@
- AC_SUBST(LDFLAGS_SHARED)
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05
-+dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
- dnl ---------------
- dnl For the given system and compiler, find the compiler flags to pass to the
- dnl loader to use the "rpath" feature.
-@@ -2694,10 +3051,10 @@
- linux*|gnu*|k*bsd*-gnu) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--openbsd[[2-9]].*) #(vi
-+openbsd[[2-9]].*|mirbsd*) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
- 	LD_RPATH_OPT="-rpath "
- 	;;
- netbsd*) #(vi
-@@ -2756,11 +3113,11 @@
- $1="$cf_library_path_list [$]$1"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
-+dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10
- dnl -------------
- dnl Compute the library-prefix for the given host system
- dnl $1 = variable to set
--AC_DEFUN([CF_LIB_PREFIX],
-+define([CF_LIB_PREFIX],
- [
- 	case $cf_cv_system_name in #(vi
- 	OS/2*|os2*) #(vi
-@@ -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: 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,13 +3145,15 @@
- dnl	lib<name>.so.<maj>.<minor>
- AC_DEFUN([CF_LIB_RULES],
- [
--CF_LIB_PREFIX(cf_prefix)
-+cf_prefix=$LIB_PREFIX
- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
- 
--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 \
- 				subset=$cf_subset \
-+				driver=$cf_cv_term_driver \
- 				SymLink="$LN_S" \
- 				TermlibRoot=$TINFO_NAME \
- 				TermlibSuffix=$TINFO_SUFFIX \
-@@ -3292,7 +3659,7 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+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,11 +3688,11 @@
- 		;;
- 	shared) #(vi
- 		case $cf_cv_system_name in
--		aix[[56]]*) #(vi
-+		aix[[5-7]]*) #(vi
- 			$2='.a'
- 			$3=[$]$2
- 			;;
--		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: 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
-@@ -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
- cat >>$cf_edit_man <<CF_EOF
--	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
-+	nCurses=ignore.3x
-+	test $with_curses_h = yes && nCurses=ncurses.3x
-+	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\`
- CF_EOF
- fi
- 
-@@ -3995,6 +4365,13 @@
- fi
- CF_EOF
- 
-+if test $with_overwrite != yes ; then
-+cat >>$cf_edit_man <<CF_EOF
-+	sed -e "/\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
-+	mv \$TMP.out \$TMP
-+CF_EOF
-+fi
-+
- if test $with_curses_h != yes ; then
- cat >>$cf_edit_man <<CF_EOF
- 	sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-@@ -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
- dnl ---------------------------------------------------------------------------
--dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24
-+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
- dnl -------------
- dnl Check for the package-config program, unless disabled by command-line.
- AC_DEFUN([CF_PKG_CONFIG],
-@@ -4393,7 +4772,9 @@
- 	PKG_CONFIG=none
- 	;;
- yes) #(vi
--	AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)
-+	CF_ACVERSION_CHECK(2.52,
-+		[AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
-+		[AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
- 	;;
- *)
- 	PKG_CONFIG=$withval
-@@ -4658,7 +5039,7 @@
- test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_GNAT version: 1 updated: 2010/06/19 15:22:18
-+dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47
- dnl ------------
- dnl Check for gnatmake, ensure that it is complete.
- AC_DEFUN([CF_PROG_GNAT],[
-@@ -4666,6 +5047,7 @@
- AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
- if test "$ac_cv_prog_gnat_exists" = no; then
-    cf_ada_make=
-+   cf_cv_prog_gnat_correct=no
- else
-    CF_GNAT_VERSION
-    AC_CHECK_PROG(M4_exists, m4, yes, no)
-@@ -4709,7 +5091,7 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40
-+dnl CF_PROG_LDCONFIG version: 3 updated: 2011/06/04 20:09:13
- dnl ----------------
- dnl Check for ldconfig, needed to fixup shared libraries that would be built
- dnl and then used in the install.
-@@ -4718,7 +5100,7 @@
-   LDCONFIG=:
- else
- case "$cf_cv_system_name" in #(vi
--dragonfly*|freebsd*) #(vi
-+dragonfly*|mirbsd*|freebsd*) #(vi
-   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-   ;;
- *) LDPATH=$PATH:/sbin:/usr/sbin
-@@ -4759,7 +5141,7 @@
- test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_REGEX version: 8 updated: 2010/08/07 14:09:44
-+dnl CF_REGEX version: 9 updated: 2012/01/07 15:08:24
- dnl --------
- dnl Attempt to determine if we've got one of the flavors of regular-expression
- dnl code that we can support.
-@@ -4771,7 +5153,7 @@
- cf_regex_libs="regex re"
- case $host_os in #(vi
- mingw*)
--	cf_regex_libs="regex.dll $cf_regex_libs"
-+	cf_regex_libs="gnurx $cf_regex_libs"
- 	;;
- esac
- 
-@@ -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: 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 +5441,14 @@
- 	cf_cv_shlib_version_infix=no
- 
- 	case $cf_cv_system_name in #(vi
--	aix[[56]]*) #(vi
-+	aix4.[3-9]*|aix[[5-7]]*) #(vi
- 		if test "$GCC" = yes; then
- 			CC_SHARED_OPTS=
--			MK_SHARED_LIB='$(CC) -shared'
-+			MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
-+		else
-+			# CC_SHARED_OPTS='-qpic=large -G'
-+			# perhaps "-bM:SRE -bnoentry -bexpall"
-+			MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
- 		fi
- 		;;
- 	beos*) #(vi
-@@ -5115,9 +5501,19 @@
- 		# readonly to exploit a quirk in the memory manager.
- 		INSTALL_LIB="-m 555"
- 		;;
-+	interix*)
-+		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-+		if test "$cf_cv_shlib_version" = rel; then
-+			cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
-+		else
-+			cf_shared_soname='`basename $@`'
-+		fi
-+		CC_SHARED_OPTS=
-+		MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
-+		;;
- 	irix*) #(vi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		# tested with IRIX 5.2 and 'cc'.
- 		if test "$GCC" != yes; then
-@@ -5134,18 +5530,39 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
- 		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
- 			LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		CF_SHARED_SONAME
-@@ -5156,12 +5573,12 @@
- 		MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
- 		;;
--	freebsd*) #(vi
-+	dragonfly*|freebsd*) #(vi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
- 			LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
--			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
- 		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
-@@ -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)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 			if test "$cf_cv_shlib_version" = auto; then
- 			if test -f /usr/libexec/ld.elf_so; then
- 				cf_cv_shlib_version=abi
-@@ -5276,9 +5693,12 @@
- 		;;
- 	esac
- 
--	if test -n "$cf_ld_rpath_opt" ; then
--		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
--	fi
-+	# RPATH_LIST is a colon-separated list of directories
-+	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 +5710,7 @@
- 	AC_SUBST(LOCAL_LDFLAGS)
- 	AC_SUBST(LOCAL_LDFLAGS2)
- 	AC_SUBST(INSTALL_LIB)
-+	AC_SUBST(RPATH_LIST)
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
-@@ -5474,7 +5895,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40
-+dnl CF_SRC_MODULES version: 26 updated: 2012/01/07 15:08:24
- dnl --------------
- dnl For each parameter, test if the source-directory exists, and if it contains
- dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
-@@ -5497,6 +5918,7 @@
- 	TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
- fi
- 
-+PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}"
- cf_cv_src_modules=
- for cf_dir in $1
- do
-@@ -5535,6 +5957,7 @@
- 				TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
- 				TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2"
- 			fi
-+			PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}"
- 		fi
- 	fi
- done
-@@ -5562,10 +5985,18 @@
- 	SRC_SUBDIRS="$SRC_SUBDIRS test"
- fi
- test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
--test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
-+if test "$cf_with_cxx_binding" != no; then
-+	PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}"
-+	SRC_SUBDIRS="$SRC_SUBDIRS c++"
-+fi
-+
-+test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_ARG_SUFFIX"
-+test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX"
-+
-+AC_SUBST(PC_MODULES_TO_MAKE)
- 
- ADA_SUBDIRS=
--if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
-+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then
- 	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
- 	ADA_SUBDIRS="gen src"
- 	if test "x$cf_with_tests" != "xno" ; then
-@@ -5624,13 +6055,13 @@
- AC_DEFUN([CF_STRIP_G_OPT],
- [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_STRUCT_SIGACTION version: 3 updated: 2000/08/12 23:18:52
-+dnl CF_STRUCT_SIGACTION version: 4 updated: 2011/04/16 11:52:53
- dnl -------------------
- dnl Check if we need _POSIX_SOURCE defined to use struct sigaction.  We'll only
- dnl do this if we've found the sigaction function.
--dnl
--dnl If needed, define SVR4_ACTION.
- AC_DEFUN([CF_STRUCT_SIGACTION],[
-+AC_REQUIRE([CF_XOPEN_SOURCE])
-+
- if test "$ac_cv_func_sigaction" = yes; then
- AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE)
- AC_TRY_COMPILE([
-@@ -5645,22 +6076,24 @@
- #include <signal.h>],
- 	[struct sigaction act],
- 	[sigact_bad=yes
--	 AC_DEFINE(SVR4_ACTION)],
-+	 AC_DEFINE(_POSIX_SOURCE)],
- 	 [sigact_bad=unknown])])
- AC_MSG_RESULT($sigact_bad)
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46
-+dnl CF_STRUCT_TERMIOS version: 6 updated: 2011/04/16 11:52:53
- dnl -----------------
- dnl Some machines require _POSIX_SOURCE to completely define struct termios.
--dnl If so, define SVR4_TERMIO
- AC_DEFUN([CF_STRUCT_TERMIOS],[
-+AC_REQUIRE([CF_XOPEN_SOURCE])
-+
- AC_CHECK_HEADERS( \
- termio.h \
- termios.h \
- unistd.h \
- )
-+
- if test "$ISC" = yes ; then
- 	AC_CHECK_HEADERS( sys/termio.h )
- fi
-@@ -5680,7 +6113,7 @@
- #include <termios.h>],
- 			[struct termios foo; int x = foo.c_iflag],
- 			termios_bad=unknown,
--			termios_bad=yes AC_DEFINE(SVR4_TERMIO))
-+			termios_bad=yes AC_DEFINE(_POSIX_SOURCE))
- 			])
- 	AC_MSG_RESULT($termios_bad)
- 	fi
-@@ -5798,6 +6231,45 @@
- AC_SUBST(top_builddir)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50
-+dnl -------------------
-+dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
-+dnl can define it successfully.
-+AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
-+AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-+	AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+],[
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_cv_xopen_source=no],
-+	[cf_save="$CPPFLAGS"
-+	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+	 AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+],[
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_cv_xopen_source=no],
-+	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
-+	CPPFLAGS="$cf_save"
-+	])
-+])
-+
-+if test "$cf_cv_xopen_source" != no ; then
-+	CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
-+	CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
-+	cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+	CF_ADD_CFLAGS($cf_temp_xopen_source)
-+fi
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_TYPEOF_CHTYPE version: 8 updated: 2006/12/16 12:33:30
- dnl ----------------
- dnl Determine the type we should use for chtype (and attr_t, which is treated
-@@ -6182,7 +6654,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24
-+dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32
- dnl ---------------
- dnl Provide a configure option to incorporate libtool.  Define several useful
- dnl symbols for the makefile rules.
-@@ -6258,7 +6730,7 @@
- 		AC_MSG_ERROR(Cannot find libtool)
- 	fi
- ])dnl
--	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
-+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
- 	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
- 	LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -6283,7 +6755,7 @@
- 	# special hack to add -no-undefined (which libtool should do for itself)
- 	LT_UNDEF=
- 	case "$cf_cv_system_name" in #(vi
--	cygwin*|mingw32*|uwin*|aix[[456]]) #(vi
-+	cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi
- 		LT_UNDEF=-no-undefined
- 		;;
- 	esac
-@@ -6323,6 +6795,32 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10
-+dnl ------------------
-+dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
-+dnl "lib" prefix, e.g., because it used the dll naming convention.
-+dnl
-+dnl $1 = variable to set
-+AC_DEFUN([CF_WITH_LIB_PREFIX],
-+[
-+AC_MSG_CHECKING(if you want to have a library-prefix)
-+AC_ARG_WITH(lib-prefix,
-+	[  --with-lib-prefix       override library-prefix],
-+	[with_lib_prefix=$withval],
-+	[with_lib_prefix=auto])
-+AC_MSG_RESULT($with_lib_prefix)
-+
-+if test $with_lib_prefix = auto
-+then
-+	CF_LIB_PREFIX($1)
-+elif test $with_lib_prefix = no
-+then
-+	LIB_PREFIX=
-+else
-+	LIB_PREFIX=$with_lib_prefix
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
- dnl ------------
- dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-@@ -6386,7 +6884,50 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02
-+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47
-+dnl -------------------------
-+dnl Allow the choice of the pkg-config library directory to be overridden.
-+AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
-+if test "$PKG_CONFIG" != none ; then
-+	AC_MSG_CHECKING(for $PKG_CONFIG library directory)
-+	AC_ARG_WITH(pkg-config-libdir,
-+		[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-+		[PKG_CONFIG_LIBDIR=$withval],
-+		[PKG_CONFIG_LIBDIR=yes])
-+
-+	case x$PKG_CONFIG_LIBDIR in #(vi
-+	x/*) #(vi
-+		;;
-+	xyes) #(vi
-+		# look for the library directory using the same prefix as the executable
-+		cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
-+		case x`(arch) 2>/dev/null` in #(vi
-+		*64) #(vi
-+			for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib
-+			do
-+				if test -d $cf_config/pkgconfig
-+				then
-+					PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
-+					break
-+				fi
-+			done
-+			;;
-+		*)
-+			PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig
-+			;;
-+		esac
-+		;;
-+	*)
-+		;;
-+	esac
-+
-+	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
-+fi
-+
-+AC_SUBST(PKG_CONFIG_LIBDIR)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_PTHREAD version: 5 updated: 2011/12/10 19:01:56
- dnl ---------------
- dnl Check for POSIX thread library.
- AC_DEFUN([CF_WITH_PTHREAD],
-@@ -6402,23 +6943,28 @@
-     AC_CHECK_HEADER(pthread.h,[
-         AC_DEFINE(HAVE_PTHREADS_H)
- 
--        AC_MSG_CHECKING(if we can link with the pthread library)
--        cf_save_LIBS="$LIBS"
--        CF_ADD_LIB(pthread)
--        AC_TRY_LINK([
-+	for cf_lib_pthread in pthread c_r
-+	do
-+	    AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library)
-+	    cf_save_LIBS="$LIBS"
-+	    CF_ADD_LIB($cf_lib_pthread)
-+	    AC_TRY_LINK([
- #include <pthread.h>
- ],[
--        int rc = pthread_create(0,0,0,0);
-+		int rc = pthread_create(0,0,0,0);
-+		int r2 = pthread_mutexattr_settype(0, 0);
- ],[with_pthread=yes],[with_pthread=no])
--        LIBS="$cf_save_LIBS"
--        AC_MSG_RESULT($with_pthread)
-+	    LIBS="$cf_save_LIBS"
-+	    AC_MSG_RESULT($with_pthread)
-+	    test "$with_pthread" = yes && break
-+	done
- 
--        if test "$with_pthread" = yes ; then
--            CF_ADD_LIB(pthread)
--            AC_DEFINE(HAVE_LIBPTHREADS)
--        else
--            AC_MSG_ERROR(Cannot link with pthread library)
--        fi
-+	if test "$with_pthread" = yes ; then
-+	    CF_ADD_LIB($cf_lib_pthread)
-+	    AC_DEFINE(HAVE_LIBPTHREADS)
-+	else
-+	    AC_MSG_ERROR(Cannot link with pthread library)
-+	fi
-     ])
- fi
- ])
-@@ -6486,7 +7032,7 @@
- 	[USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
-+dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -6502,7 +7048,7 @@
- cf_xopen_source=
- 
- case $host_os in #(vi
--aix[[456]]*) #(vi
-+aix[[4-7]]*) #(vi
- 	cf_xopen_source="-D_ALL_SOURCE"
- 	;;
- cygwin) #(vi
-@@ -6513,6 +7059,7 @@
- 	;;
- darwin*) #(vi
- 	cf_xopen_source="-D_DARWIN_C_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- freebsd*|dragonfly*) #(vi
- 	# 5.x headers associate
-@@ -6530,15 +7077,23 @@
- 	;;
- irix[[56]].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
--	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
-+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
-+	cf_XOPEN_SOURCE=
-+	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
- 	;;
- netbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	;;
-+openbsd[[4-9]]*) #(vi
-+	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
-+	cf_xopen_source="-D_BSD_SOURCE"
-+	cf_XOPEN_SOURCE=600
- 	;;
- openbsd*) #(vi
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -6552,36 +7107,11 @@
- sco*) #(vi
- 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
- 	;;
--solaris2.1[[0-9]]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	;;
--solaris2.[[1-9]]) #(vi
-+solaris2.*) #(vi
- 	cf_xopen_source="-D__EXTENSIONS__"
- 	;;
- *)
--	AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
--	AC_TRY_COMPILE([#include <sys/types.h>],[
--#ifndef _XOPEN_SOURCE
--make an error
--#endif],
--	[cf_cv_xopen_source=no],
--	[cf_save="$CPPFLAGS"
--	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	 AC_TRY_COMPILE([#include <sys/types.h>],[
--#ifdef _XOPEN_SOURCE
--make an error
--#endif],
--	[cf_cv_xopen_source=no],
--	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
--	CPPFLAGS="$cf_save"
--	])
--])
--	if test "$cf_cv_xopen_source" != no ; then
--		CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
--		CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
--		cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
--		CF_ADD_CFLAGS($cf_temp_xopen_source)
--	fi
-+	CF_TRY_XOPEN_SOURCE
- 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
- 	;;
- esac
-@@ -6589,4 +7119,33 @@
- if test -n "$cf_xopen_source" ; then
- 	CF_ADD_CFLAGS($cf_xopen_source)
- fi
-+
-+dnl In anything but the default case, we may have system-specific setting
-+dnl which is still not guaranteed to provide all of the entrypoints that
-+dnl _XOPEN_SOURCE would yield.
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+	AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
-+	AC_TRY_COMPILE([#include <stdlib.h>],[
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_XOPEN_SOURCE_set=yes],
-+	[cf_XOPEN_SOURCE_set=no])
-+	AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
-+	if test $cf_XOPEN_SOURCE_set = yes
-+	then
-+		AC_TRY_COMPILE([#include <stdlib.h>],[
-+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-+make an error
-+#endif],
-+		[cf_XOPEN_SOURCE_set_ok=yes],
-+		[cf_XOPEN_SOURCE_set_ok=no])
-+		if test $cf_XOPEN_SOURCE_set_ok = no
-+		then
-+			AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
-+		fi
-+	else
-+		CF_TRY_XOPEN_SOURCE
-+	fi
-+fi
- ])
-diff -Naur ncurses-5.9.orig/announce.html.in ncurses-5.9/announce.html.in
---- 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">
- <!--
--  $Id: announce.html.in,v 1.85 2011/04/04 00:05:34 tom Exp $
-+  $Id: announce.html.in,v 1.86 2011/09/10 18:11:12 tom Exp $
-   ****************************************************************************
-   * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-   *                                                                          *
-@@ -77,30 +77,38 @@
-   compatible from ncurses 5.0 through 5.8; very few applications
-   will require recompilation, depending on the platform. These are
-   the highlights from the change-log since ncurses 5.8 release.
--  <p>
--  This is a bug-fix release, correcting a small number of urgent problems
--  in the ncurses library from the 5.8 release.
--  <p>
--  It also improves the Ada95 binding:
-+
-+  <p>This is a bug-fix release, correcting a small number of urgent
-+  problems in the ncurses library from the 5.8 release.</p>
-+
-+  <p>It also improves the Ada95 binding:</p>
-+
-   <ul>
--  <li>fixes a longstanding portability problem with its use of the
--      <a href="http://invisible-island.net/ncurses/man/form_fieldtype.3x">set_field_type</a>
--      function.  Because that function uses variable-length argument lists,
--      its interface with gnat does not work with certain platforms.
--  <li>improves configurability and portability, particularly when built
--      separately from the main ncurses tree.  The 5.8 release introduced
--      scripts which can be used to construct separate tarballs for the
--      Ada95 and ncurses examples.
--      <p>Those were a proof of concept.  For the 5.9 release, those
--      scripts are augmented with rpm- and dpkg-scripts used in test builds
--      against a variety of gnat- and system ncurses versions as old as
--      gnat 3.15 and ncurses 5.4 (see snapshots and systems tested
--      <a href="http://invisible-island.net/ncurses/ncurses-Ada95.html">here</a>.
--  <li>additional improvements were made for portability of the
--      ncurses examples, adding rpm- and dpkg-scripts for test-builds.
--      See 
--      <a href="http://invisible-island.net/ncurses/ncurses-examples.html">this page</a>
--      for snapshots and other information.
-+    <li>fixes a longstanding portability problem with its use of
-+    the <a href=
-+    "http://invisible-island.net/ncurses/man/form_fieldtype.3x">set_field_type</a>
-+    function. Because that function uses variable-length argument
-+    lists, its interface with gnat does not work with certain
-+    platforms.</li>
-+
-+    <li>improves configurability and portability, particularly when
-+    built separately from the main ncurses tree. The 5.8 release
-+    introduced scripts which can be used to construct separate
-+    tarballs for the Ada95 and ncurses examples.
-+
-+      <p>Those were a proof of concept. For the 5.9 release, those
-+      scripts are augmented with rpm- and dpkg-scripts used in test
-+      builds against a variety of gnat- and system ncurses versions
-+      as old as gnat 3.15 and ncurses 5.4 (see snapshots and
-+      systems tested <a href=
-+      "http://invisible-island.net/ncurses/ncurses-Ada95.html">here</a>.</p>
-+    </li>
-+
-+    <li>additional improvements were made for portability of the
-+    ncurses examples, adding rpm- and dpkg-scripts for test-builds.
-+    See <a href=
-+    "http://invisible-island.net/ncurses/ncurses-examples.html">this
-+    page</a> for snapshots and other information.</li>
-   </ul>
- 
-   <h1>Features of Ncurses</h1>The ncurses package is fully
-@@ -364,6 +372,13 @@
-   are made available at <a href=
-   "ftp://invisible-island.net/ncurses/">ftp://invisible-island.net/ncurses/</a>&nbsp;.</p>
- 
-+  <p>There is an archive of the mailing list here:</p>
-+
-+  <p><a href=
-+  "http://lists.gnu.org/archive/html/bug-ncurses">http://lists.gnu.org/archive/html/bug-ncurses</a>
-+  (also <a href=
-+  "https://lists.gnu.org/archive/html/bug-ncurses">https</a>)</p>
-+
-   <h2>Future Plans</h2>
- 
-   <ul>
-diff -Naur ncurses-5.9.orig/c++/Makefile.in ncurses-5.9/c++/Makefile.in
---- 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.96 2012/03/17 16:45:38 tom Exp $
- ##############################################################################
--# 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 "Software"), #
-@@ -112,6 +112,7 @@
- MY_LIBRARY	= ../lib/$(LIBNAME)
- 
- LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
-+RPATH_LIST	= @RPATH_LIST@
- 
- LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY)
- LINK_NORMAL	= $(LINK_FLAGS)
-@@ -169,7 +170,7 @@
- 	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
- 		-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
- 		-rpath $(INSTALL_PREFIX)$(libdir) \
--		$(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
-+		$(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST)
- 
- 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-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++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 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: cursesapp.h,v 1.11 2005/05/28 21:57:44 tom Exp $
-+// $Id: cursesapp.h,v 1.12 2011/09/17 22:12:10 tom Exp $
- 
- #ifndef NCURSES_CURSESAPP_H_incl
- #define NCURSES_CURSESAPP_H_incl
-@@ -80,6 +80,7 @@
-   // This method is called to initialize the SLKs. Default is nothing.
-   // You may rewrite this in your derived class
-   virtual void init_labels(Soft_Label_Key_Set& S) const {
-+    (void) S;
-   }
- 
-   // Your derived class must implement this method. The return value must
-@@ -118,6 +119,8 @@
-   // Process the commandline arguments. The default implementation simply
-   // ignores them. Your derived class may rewrite this.
-   virtual void handleArgs(int argc, char* argv[]) {
-+    (void) argc;
-+    (void) argv;
-   }
- 
-   // Does this application use colors?
-@@ -138,37 +141,37 @@
- 
-   // Attributes to use for menu and forms foregrounds
-   virtual chtype foregrounds() const {
--    return b_Colors ? COLOR_PAIR(1) : A_BOLD;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(1)) : A_BOLD;
-   }
- 
-   // Attributes to use for menu and forms backgrounds
-   virtual chtype backgrounds() const {
--    return b_Colors ? COLOR_PAIR(2) : A_NORMAL;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(2)) : A_NORMAL;
-   }
- 
-   // Attributes to use for inactive (menu) elements
-   virtual chtype inactives() const {
--    return b_Colors ? (COLOR_PAIR(3)|A_DIM) : A_DIM;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(3)|A_DIM) : A_DIM;
-   }
- 
-   // Attributes to use for (form) labels and SLKs
-   virtual chtype labels() const {
--    return b_Colors ? COLOR_PAIR(4) : A_NORMAL;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL;
-   }
- 
-   // Attributes to use for form backgrounds
-   virtual chtype dialog_backgrounds() const {
--    return b_Colors ? COLOR_PAIR(4) : A_NORMAL;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL;
-   }
- 
-   // Attributes to use as default for (form) window backgrounds
-   virtual chtype window_backgrounds() const {
--    return b_Colors ? COLOR_PAIR(5) : A_NORMAL;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(5)) : A_NORMAL;
-   }
- 
-   // Attributes to use for the title window
-   virtual chtype screen_titles() const {
--    return b_Colors ? COLOR_PAIR(6) : A_BOLD;
-+    return b_Colors ? static_cast<chtype>(COLOR_PAIR(6)) : A_BOLD;
-   }
- 
- };
-diff -Naur ncurses-5.9.orig/c++/cursesf.cc ncurses-5.9/c++/cursesf.cc
---- 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++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 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 "cursesf.h"
- #include "cursesapp.h"
- 
--MODULE_ID("$Id: cursesf.cc,v 1.21 2005/08/13 18:09:06 tom Exp $")
-+MODULE_ID("$Id: cursesf.cc,v 1.22 2011/09/17 22:12:10 tom Exp $")
- 
- NCursesFormField::~NCursesFormField ()
- {
-@@ -234,11 +234,13 @@
- void
- NCursesForm::On_Field_Init(NCursesFormField& field)
- {
-+  (void) field;
- }
- 
- void
- NCursesForm::On_Field_Termination(NCursesFormField& field)
- {
-+  (void) field;
- }
- 
- // call the form driver and do basic error checking.
-@@ -260,16 +262,19 @@
- 
- void NCursesForm::On_Request_Denied(int c) const
- {
-+  (void) c;
-   ::beep();
- }
- 
- void NCursesForm::On_Invalid_Field(int c) const
- {
-+  (void) c;
-   ::beep();
- }
- 
- void NCursesForm::On_Unknown_Command(int c) const
- {
-+  (void) c;
-   ::beep();
- }
- 
-@@ -373,6 +378,7 @@
- //
- bool _nc_xx_fld_fcheck(FIELD *f, const void *u)
- {
-+  (void) f;
-   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-   assert(F != 0);
-   UserDefinedFieldType* udf = reinterpret_cast<UserDefinedFieldType*>(F->fieldtype());
-@@ -405,6 +411,7 @@
- 
- bool _nc_xx_next_choice(FIELD *f, const void *u)
- {
-+  (void) f;
-   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-   assert(F != 0);
-   UserDefinedFieldType_With_Choice* udf =
-@@ -415,6 +422,7 @@
- 
- bool _nc_xx_prev_choice(FIELD *f, const void *u)
- {
-+  (void) f;
-   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-   assert(F != 0);
-   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-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-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            *
-@@ -31,7 +31,7 @@
-  *   Author: Juergen Pfeifer, 1997                                          *
-  ****************************************************************************/
- 
--// $Id: cursesf.h,v 1.28 2005/08/13 18:08:24 tom 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
-@@ -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)
-@@ -686,7 +686,7 @@
- 	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-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++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 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 "cursesm.h"
- #include "cursesapp.h"
- 
--MODULE_ID("$Id: cursesm.cc,v 1.22 2005/04/02 20:39:05 tom Exp $")
-+MODULE_ID("$Id: cursesm.cc,v 1.23 2011/09/17 22:11:32 tom Exp $")
- 
- NCursesMenuItem::~NCursesMenuItem()
- {
-@@ -375,33 +375,39 @@
- void
- NCursesMenu::On_Item_Init(NCursesMenuItem& item)
- {
-+  (void) item;
- }
- 
- void
- NCursesMenu::On_Item_Termination(NCursesMenuItem& item)
- {
-+  (void) item;
- }
- 
- void
- NCursesMenu::On_Request_Denied(int c) const
- {
-+  (void) c;
-   ::beep();
- }
- 
- void
- NCursesMenu::On_Not_Selectable(int c) const
- {
-+  (void) c;
-   ::beep();
- }
- 
- void
- NCursesMenu::On_No_Match(int c) const
- {
-+  (void) c;
-   ::beep();
- }
- 
- void
- NCursesMenu::On_Unknown_Command(int c) const
- {
-+  (void) c;
-   ::beep();
- }
-diff -Naur ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
---- 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-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            *
-@@ -31,7 +31,7 @@
-  *   Author: Juergen Pfeifer, 1997                                          *
-  ****************************************************************************/
- 
--// $Id: cursesm.h,v 1.25 2005/08/13 18:10:36 tom Exp $
-+// $Id: cursesm.h,v 1.28 2012/06/08 17:43:56 Richard.Yao Exp $
- 
- #ifndef NCURSES_CURSESM_H_incl
- #define NCURSES_CURSESM_H_incl 1
-@@ -82,6 +82,7 @@
-   NCursesMenuItem(const NCursesMenuItem& rhs)
-     : item(0)
-   {
-+    (void) rhs;
-   }
- 
-   virtual ~NCursesMenuItem ();
-@@ -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)
-@@ -644,7 +645,7 @@
- 	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-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++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 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 <etip.h>
- #include <cursesw.h>
- 
--MODULE_ID("$Id: cursespad.cc,v 1.13 2008/08/04 18:59:22 tom Exp $")
-+MODULE_ID("$Id: cursespad.cc,v 1.14 2011/09/17 22:12:10 tom Exp $")
- 
- NCursesPad::NCursesPad(int nlines, int ncols)
-   : NCursesWindow(),
-@@ -220,6 +220,7 @@
- 
- void NCursesFramedPad::OnOperation(int pad_req)
- {
-+  (void) pad_req;
-   NCursesWindow* W = Win();
-   NCursesWindow* W2 = getWindow();
- 
-diff -Naur ncurses-5.9.orig/c++/cursesw.cc ncurses-5.9/c++/cursesw.cc
---- 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++;-*-
- /****************************************************************************
-- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2007-2009,2011 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 "internal.h"
- #include "cursesw.h"
- 
--MODULE_ID("$Id: cursesw.cc,v 1.51 2009/03/28 21:31:37 tom Exp $")
-+MODULE_ID("$Id: cursesw.cc,v 1.52 2011/09/17 22:12:10 tom Exp $")
- 
- #define COLORS_NEED_INITIALIZATION  -1
- #define COLORS_NOT_INITIALIZED       0
-@@ -285,12 +285,14 @@
- NCursesWindow::NCursesWindow(WINDOW *win, int ncols)
-   : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
- {
-+    (void) ncols;
-     initialize();
-     w = win;
- }
- 
- int _nc_xx_ripoff_init(WINDOW *w, int ncols)
- {
-+    (void) ncols;
-     int res = ERR;
- 
-     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-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++;-*-
- // vile:cppmode
- /****************************************************************************
-- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 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 @@
- #ifndef NCURSES_CURSESW_H_incl
- #define NCURSES_CURSESW_H_incl 1
- 
--// $Id: cursesw.h,v 1.48 2008/01/19 21:09:10 tom Exp $
-+// $Id: cursesw.h,v 1.49 2011/09/17 22:12:10 tom Exp $
- 
- #include <etip.h>
- 
-@@ -1438,16 +1438,19 @@
-   // The driver translates the keystroke c into an Pad_Request
- 
-   virtual void OnUnknownOperation(int pad_req) {
-+    (void) pad_req;
-     ::beep();
-   }
-   // This is called if the driver returns an unknown op-code
- 
-   virtual void OnNavigationError(int pad_req) {
-+    (void) pad_req;
-     ::beep();
-   }
-   // This is called if a navigation request couldn't be satisfied
- 
-   virtual void OnOperation(int pad_req) {
-+    (void) pad_req;
-   };
-   // OnOperation is called if a Pad_Operation was executed and just before
-   // the refresh() operation is done.
-@@ -1542,11 +1545,15 @@
-   }
- 
-   void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1) {
-+    (void) view;
-+    (void) v_grid;
-+    (void) h_grid;
-     err_handler("Operation not allowed");
-   }
-   // Disable this call; the viewport is already defined
- 
-   void setSubWindow(NCursesWindow& sub) {
-+    (void) sub;
-     err_handler("Operation not allowed");
-   }
-   // 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-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-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 @@
-  *   Demo code for NCursesMenu and NCursesForm written by
-  *   Juergen Pfeifer
-  *
-- * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $
-+ * $Id: demo.cc,v 1.41 2012/02/23 10:41:56 tom Exp $
-  */
- 
- #include "internal.h"
-@@ -220,6 +220,7 @@
-   int chk;
- protected:
-   bool field_check(NCursesFormField& f) {
-+    (void) f;
-     return TRUE;
-   }
-   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-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++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 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: etip.h.in,v 1.37 2008/08/30 19:27:32 tom Exp $
-+// $Id: etip.h.in,v 1.38 2011/10/29 14:01:50 tom Exp $
- 
- #ifndef NCURSES_ETIP_H_incl
- #define NCURSES_ETIP_H_incl 1
-@@ -184,7 +184,7 @@
- 
-   NCursesPanelException (const char *msg, int err) :
-     NCursesException (msg, err),
--    p (NULL)
-+    p (0)
-     {};
- 
-   NCursesPanelException (const NCursesPanel* panel,
-@@ -196,7 +196,7 @@
- 
-   NCursesPanelException (int err) :
-     NCursesException ("panel library error", err),
--    p (NULL)
-+    p (0)
-     {};
- 
-   NCursesPanelException (const NCursesPanel* panel,
-@@ -235,7 +235,7 @@
- 
-   NCursesMenuException (const char *msg, int err) :
-     NCursesException (msg, err),
--    m (NULL)
-+    m (0)
-     {};
- 
-   NCursesMenuException (const NCursesMenu* menu,
-@@ -247,7 +247,7 @@
- 
-   NCursesMenuException (int err) :
-     NCursesException ("menu library error", err),
--    m (NULL)
-+    m (0)
-     {};
- 
-   NCursesMenuException (const NCursesMenu* menu,
-@@ -286,7 +286,7 @@
- 
-   NCursesFormException (const char *msg, int err) :
-     NCursesException (msg, err),
--    f (NULL)
-+    f (0)
-     {};
- 
-   NCursesFormException (const NCursesForm* form,
-@@ -298,7 +298,7 @@
- 
-   NCursesFormException (int err) :
-     NCursesException ("form library error", err),
--    f (NULL)
-+    f (0)
-     {};
- 
-   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-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
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--#   Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011, 2012 Free Software Foundation, Inc.
- 
--timestamp='2010-09-24'
-+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
-@@ -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.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--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, 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 +90,7 @@
-   exit 1
- fi
- 
--trap 'exit 1' HUP INT TERM
-+trap 'exit 1' 1 2 15
- 
- # 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 +104,7 @@
- 
- set_cc_for_build='
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
--trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-  { 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) ; } ||
-@@ -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.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit ;;
-+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+	exitcode=$?
-+	trap '' 0
-+	exit $exitcode ;;
-     Alpha\ *:Windows_NT*:*)
- 	# 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 +327,8 @@
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     s390x:SunOS:*:*)
--    	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--    	exit ;;
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-@@ -495,7 +496,7 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit ;;
-+	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	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}
- 		exit ;;
- 	    IA64)
--	    	echo ia64-unknown-interix${UNAME_RELEASE}
--	    	exit ;;
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
- 	esac ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
-@@ -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; }
- 	;;
-     or32:Linux:*:*)
--    	echo or32-unknown-linux-gnu
--    	exit ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
- 	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--    	echo hppa64-unknown-linux-gnu
--    	exit ;;
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# 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-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
--#   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='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
-@@ -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)
- 
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--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, 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."
-@@ -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
- 		;;
-- 	-chorusrdb)
-- 		os=-chorusrdb
-+	-chorusrdb)
-+		os=-chorusrdb
- 		basic_machine=$1
-- 		;;
-+		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-@@ -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 \
- 	| msp430 \
--	| nds32 | nds32le | nds32be\
-+	| nds32 | nds32le | nds32be \
- 	| nios | nios2 \
- 	| ns16k | ns32k \
-+	| open8 \
- 	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
--	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle \
- 	| pyramid \
--	| rx \
-+	| rl78 | rx \
- 	| score \
- 	| 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 \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
--	| spu | strongarm \
--	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+	| spu \
-+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- 	| ubicom32 \
--	| v850 | v850e \
-+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- 	| we32k \
--	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| x86 | xc16x | xstormy16 | xtensa \
- 	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
-@@ -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.
- 	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-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| open8-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- 	| pyramid-* \
--	| 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-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+	| tahoe-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
--	| tile-* | tilegx-* \
-+	| tile*-* \
- 	| tron-* \
- 	| ubicom32-* \
--	| v850-* | v850e-* | vax-* \
-+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+	| vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* \
- 	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
- 	| z8k-* | z80-*)
-@@ -539,7 +567,7 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16)
-+	cr16 | cr16-*)
- 		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
-@@ -697,7 +725,6 @@
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
- 		;;
--# 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-/'`
- 		;;
-+	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-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc-* | ppcbe-*)
-+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
-@@ -1046,6 +1082,9 @@
- 		basic_machine=i860-stratus
- 		os=-sysv4
- 		;;
-+	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -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
- 		;;
-+	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+		;;
- 	ymp)
- 		basic_machine=ymp-cray
- 		os=-unicos
-@@ -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 @@
- 		;;
- 	m68000-sun)
- 		os=-sunos3
--		# This also exists in the configure program, but was not the
--		# default.
--		# os=-sunos4
- 		;;
- 	m68*-cisco)
- 		os=-aout
-diff -Naur ncurses-5.9.orig/configure ncurses-5.9/configure
---- 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.552 .
- # 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.
-@@ -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
-   --with-pkg-config{=path} enable/disable use of pkg-config
-+  --with-pkg-config-libdir=XXX use given directory for installing pc-files
-   --enable-pc-files       generate and install .pc files for pkg-config
-   --enable-mixed-case     tic should assume mixed-case filenames
-   --with-install-prefix   prefixes actual install-location ($DESTDIR)
-@@ -719,6 +729,7 @@
-   --with-normal           generate normal-libraries (default)
-   --with-debug            generate debug-libraries (default)
-   --with-profile          generate profile-libraries
-+  --with-lib-prefix       override library-prefix
-   --with-termlib          generate separate terminfo library
-   --with-ticlib           generate separate tic library
-   --with-gpm              use Alessandro Rubini's GPM library
-@@ -735,6 +746,7 @@
-   --with-hashed-db        specify hashed-database library
-   --with-fallbacks=XXX    specify list of fallback terminal descriptions
-   --without-xterm-new     specify if xterm terminfo should be old version
-+  --with-xterm-kbs=XXX     specify if xterm backspace sends BS or DEL
-   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
-   --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
-   --disable-big-core      assume machine has little memory
-@@ -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: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 +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:1035: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -1026,7 +1040,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:1029: 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 +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: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: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=: ;;
-     ,);;
-     *)
-       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: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: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:1073:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -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: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: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 +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:1115: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:1104: \$? = $ac_status" >&5
-+  echo "$as_me:1118: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -1114,7 +1128,7 @@
- 
- top_builddir=`pwd`
- 
--echo "$as_me:1117: 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 +1138,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:1127: 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:1145: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -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: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 +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: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 +1173,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1162: 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; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1168: 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 +1189,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1178: 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; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1184: 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 +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: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 +1215,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1204: 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; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1210: 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 +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: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 +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: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: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 +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: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: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; }; }
- 
- fi
--echo "$as_me:1264: 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
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:1271: 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 +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: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; }; }
- 
- fi
--echo "$as_me:1285: 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 +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: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 +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: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; }; }
- 
- fi
--echo "$as_me:1307: 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 +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: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: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: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 +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: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 +1373,23 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1362: 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
- 	case "$cf_cv_system_name" in
- 		# non-vendor systems don't have a conflict
--	openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu)
-+	openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu)
- 		prefix=/usr
- 		;;
- 	*)	prefix=$ac_default_prefix
- 		;;
- 	esac
- fi
--echo "$as_me:1374: 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: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,11 +1412,26 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1401: result: $includedir" >&5
-+echo "$as_me:1415: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
- ###	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
--echo "$as_me:1415: 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
--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
--break
--done
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:1438: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:1441: result: no" >&5
--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 $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
--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 "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:1476: result: no" >&5
--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 $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
--break
--done
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:1512: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:1515: result: no" >&5
--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 $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
--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 "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:1550: result: no" >&5
--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 $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
--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 "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:1608: result: no" >&5
--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: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 +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:1461: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1469: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1645: result: no" >&5
-+  echo "$as_me:1472: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1500: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1508: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1684: result: no" >&5
-+  echo "$as_me:1511: result: no" >&5
- echo "${ECHO_T}no" >&6
- 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:1521: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1701:" \
-+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: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:1532: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1709: \"$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:1537: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1714: \"$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:1542: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1721 "configure"
-+#line 1546 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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: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:1565: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1743: \$? = $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 +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:1591: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1772: result: $ac_file" >&5
-+echo "$as_me:1597: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1777: 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
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1783: \"$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:1611: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1793: 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 +1623,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1801: result: yes" >&5
-+echo "$as_me:1626: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1808: 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:1635: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1813: 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:1640: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1818: \$? = $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 +1656,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1834: 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; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1840: result: $ac_cv_exeext" >&5
-+echo "$as_me:1665: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1846: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1852 "configure"
-+#line 1677 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:1689: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1867: \$? = $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 +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:1704: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1886: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1896 "configure"
-+#line 1721 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1908,16 +1733,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1911: \"$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: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:1742: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1920: \$? = $ac_status" >&5
-+  echo "$as_me:1745: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -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: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`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1938: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1944 "configure"
-+#line 1769 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1953,16 +1778,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1956: \"$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: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:1787: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1965: \$? = $ac_status" >&5
-+  echo "$as_me:1790: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -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: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 +1824,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2002: \"$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: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:1833: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2011: \$? = $ac_status" >&5
-+  echo "$as_me:1836: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -2020,7 +1845,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2023 "configure"
-+#line 1848 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -2033,16 +1858,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2036: \"$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: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:1867: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2045: \$? = $ac_status" >&5
-+  echo "$as_me:1870: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -2052,7 +1877,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2055 "configure"
-+#line 1880 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -2064,16 +1889,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2067: \"$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: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:1898: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2076: \$? = $ac_status" >&5
-+  echo "$as_me:1901: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -2103,11 +1928,11 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:2106: 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:1935: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
-@@ -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: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 +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 1966 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2146: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2152: \$? = $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 +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 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:2004: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2185: \$? = $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 +2044,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:2222: 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 +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 2057 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2237: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2243: \$? = $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 +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 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:2095: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2276: \$? = $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 +2126,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2304: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2324 "configure"
-+#line 2149 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- int Autoconf = TIOCGETP;
-@@ -2336,7 +2161,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2339 "configure"
-+#line 2164 "configure"
- #include "confdefs.h"
- #include <termio.h>
- int Autoconf = TCGETA;
-@@ -2349,14 +2174,14 @@
- 
-   fi
- fi
--echo "$as_me:2352: 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
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:2359: 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 +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:2200: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2378: \$? = $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:2205: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2383: \$? = $ac_status" >&5
-+  echo "$as_me:2208: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -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:2219: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2397: 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:2226: checking for POSIXized ISC" >&5
- echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
- if test -d /etc/conf/kconfig.d &&
-    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
--  echo "$as_me:2406: 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 +2242,115 @@
-     CC="$CC -Xp"
-   fi
- else
--  echo "$as_me:2420: result: no" >&5
-+  echo "$as_me:2245: result: no" >&5
- echo "${ECHO_T}no" >&6
-   ISC=
- fi
- 
--echo "$as_me:2425: checking for ${CC:-cc} option to accept ANSI C" >&5
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+# 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:2256: checking \$CC variable" >&5
-+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
-+case "$CC" in #(vi
-+*[\ \	]-[IUD]*)
-+	echo "$as_me:2260: result: broken" >&5
-+echo "${ECHO_T}broken" >&6
-+	{ 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...
-+	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-+	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+for cf_add_cflags in $cf_flags
-+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
-+
-+	;;
-+*)
-+	echo "$as_me:2348: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+	;;
-+esac
-+
-+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 +2454,7 @@
- fi
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 2529 "configure"
-+#line 2457 "configure"
- #include "confdefs.h"
- 
- #ifndef CC_HAS_PROTOS
-@@ -2547,16 +2475,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2550: \"$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: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:2484: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2559: \$? = $ac_status" >&5
-+  echo "$as_me:2487: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ansi_cc="$cf_arg"; break
- else
-@@ -2569,7 +2497,7 @@
- CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:2572: 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 +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: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 +2624,13 @@
-   LDCONFIG=:
- else
- case "$cf_cv_system_name" in #(vi
--dragonfly*|freebsd*) #(vi
-+dragonfly*|mirbsd*|freebsd*) #(vi
-   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-   ;;
- *) LDPATH=$PATH:/sbin:/usr/sbin
-   # Extract the first word of "ldconfig", so it can be a program name with args.
- set dummy ldconfig; ac_word=$2
--echo "$as_me:2705: 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 +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:2650: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2730,10 +2658,10 @@
- LDCONFIG=$ac_cv_path_LDCONFIG
- 
- if test -n "$LDCONFIG"; then
--  echo "$as_me:2733: 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:2664: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +2679,7 @@
- else
-   cf_with_cxx=yes
- fi;
--echo "$as_me:2754: 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 +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: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 +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:2715: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2723: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:2798: result: no" >&5
-+  echo "$as_me:2726: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:2754: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2762: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6
- else
--  echo "$as_me:2837: result: no" >&5
-+  echo "$as_me:2765: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2846,32 +2774,32 @@
- fi
- 
- # Provide some information about the compiler.
--echo "$as_me:2849:" \
-+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: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:2783: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2857: \"$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:2788: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2862: \"$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:2793: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:2868: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2874 "configure"
-+#line 2802 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2886,16 +2814,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2889: \"$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: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:2823: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2898: \$? = $ac_status" >&5
-+  echo "$as_me:2826: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -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: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`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="-g"
--echo "$as_me:2916: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2922 "configure"
-+#line 2850 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2931,16 +2859,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2934: \"$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: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:2868: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2943: \$? = $ac_status" >&5
-+  echo "$as_me:2871: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cxx_g=yes
- else
-@@ -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: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 +2905,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2980 "configure"
-+#line 2908 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -2990,16 +2918,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2993: \"$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: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:2927: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3002: \$? = $ac_status" >&5
-+  echo "$as_me:2930: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3009,7 +2937,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3012 "configure"
-+#line 2940 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -3021,16 +2949,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3024: \"$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: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:2958: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3033: \$? = $ac_status" >&5
-+  echo "$as_me:2961: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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: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 +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:3005: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -3085,28 +3013,30 @@
- CXX=$ac_cv_path_CXX
- 
- if test -n "$CXX"; then
--  echo "$as_me:3088: 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:3019: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	fi
--	if test "$CXX" = "g++" ; then
--		{ echo "$as_me:3097: WARNING: ignoring hardcoded g++" >&5
--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
-+		;;
-+	esac
- fi
- 
- GXX_VERSION=none
- if test "$GXX" = yes; then
--	echo "$as_me:3105: checking version of g++" >&5
--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:3039: result: $GXX_VERSION" >&5
- echo "${ECHO_T}$GXX_VERSION" >&6
- fi
- 
-@@ -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:3047: WARNING: templates do not work" >&5
- echo "$as_me: WARNING: templates do not work" >&2;}
- 	;;
- esac
- 
--echo "$as_me:3122: 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,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: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: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.
--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: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: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 +3077,10 @@
- else
-   cf_with_manpages=yes
- fi;
--echo "$as_me:3158: 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: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 +3090,10 @@
- else
-   cf_with_progs=yes
- fi;
--echo "$as_me:3171: 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: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 +3103,10 @@
- else
-   cf_with_tests=yes
- fi;
--echo "$as_me:3184: 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: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 +3116,7 @@
- else
-   with_curses_h=yes
- fi;
--echo "$as_me:3197: 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 +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: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 +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:3160: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3168: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:3249: result: no" >&5
-+  echo "$as_me:3171: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:3256: 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: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 +3189,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:3270: 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:3196: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -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: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 +3258,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:3339: 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 +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: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 +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:3301: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3309: result: $LINT" >&5
- echo "${ECHO_T}$LINT" >&6
- else
--  echo "$as_me:3390: result: no" >&5
-+  echo "$as_me:3312: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$LINT" && break
- done
- 
--echo "$as_me:3397: 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:3323: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:3404: 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: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 +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:3342: result: $cf_prog_ln_sf" >&5
- echo "${ECHO_T}$cf_prog_ln_sf" >&6
- 
- test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
- 
--echo "$as_me:3425: 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 +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: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 +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: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 +3405,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:3486: 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 +3413,11 @@
- 	PKG_CONFIG=none
- 	;;
- yes) #(vi
--	if test -n "$ac_tool_prefix"; then
-+
-+if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:3497: 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 +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:3437: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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:3448: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:3528: result: no" >&5
-+  echo "$as_me:3451: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3477: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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: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:3492: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +3540,51 @@
- 
- fi
- 
--if test "$PKG_CONFIG" != no ; then
--	echo "$as_me:3621: 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
-+if test "$PKG_CONFIG" != none ; then
-+	echo "$as_me:3544: checking for $PKG_CONFIG library directory" >&5
-+echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
- 
--	# Leave this as something that can be overridden in the environment.
--	if test -z "$PKG_CONFIG_LIBDIR" ; then
--		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
--	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
-+  withval="$with_pkg_config_libdir"
-+  PKG_CONFIG_LIBDIR=$withval
-+else
-+  PKG_CONFIG_LIBDIR=yes
-+fi;
-+
-+	case x$PKG_CONFIG_LIBDIR in #(vi
-+	x/*) #(vi
-+		;;
-+	xyes) #(vi
-+		# look for the library directory using the same prefix as the executable
-+		cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`
-+		case x`(arch) 2>/dev/null` in #(vi
-+		*64) #(vi
-+			for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib
-+			do
-+				if test -d $cf_config/pkgconfig
-+				then
-+					PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
-+					break
-+				fi
-+			done
-+			;;
-+		*)
-+			PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig
-+			;;
-+		esac
-+		;;
-+	*)
-+		;;
-+	esac
-+
-+	echo "$as_me:3581: result: $PKG_CONFIG_LIBDIR" >&5
-+echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
-+fi
-+
-+if test "$PKG_CONFIG" != none ; then
-+	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 +3593,48 @@
- else
-   enable_pc_files=no
- fi;
--		echo "$as_me:3638: result: $enable_pc_files" >&5
-+	echo "$as_me:3596: result: $enable_pc_files" >&5
- echo "${ECHO_T}$enable_pc_files" >&6
--	else
--		echo "$as_me:3641: result: no" >&5
--echo "${ECHO_T}no" >&6
--		{ 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;}
--		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
-+	enable_pc_files=no
- fi
- 
--echo "$as_me:3649: 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 +3644,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:3659: 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: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 +3675,7 @@
- fi
- 
- fi
--echo "$as_me:3690: 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 +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: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 +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:3715: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:3731: result: no" >&5
-+  echo "$as_me:3719: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -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: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 +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:3743: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3751: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:3766: result: no" >&5
-+  echo "$as_me:3754: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3780: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3788: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:3803: result: no" >&5
-+  echo "$as_me:3791: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3815: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3824: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3839: result: no" >&5
-+  echo "$as_me:3827: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:3846: 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 +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:3849: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3858: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3873: result: no" >&5
-+  echo "$as_me:3861: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3890,7 +3878,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3893: 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 +3912,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:3927: result: $cf_cv_makeflags" >&5
-+echo "$as_me:3915: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:3933: 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 +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:3936: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3944: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:3959: result: no" >&5
-+  echo "$as_me:3947: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:3971: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:3980: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:3995: result: no" >&5
-+  echo "$as_me:3983: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:4010: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4018: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:4033: result: no" >&5
-+  echo "$as_me:4021: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:4045: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4054: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:4069: result: no" >&5
-+  echo "$as_me:4057: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:4084: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4092: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4107: result: no" >&5
-+  echo "$as_me:4095: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:4119: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4128: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4143: result: no" >&5
-+  echo "$as_me:4131: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:4158: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4166: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4181: result: no" >&5
-+  echo "$as_me:4169: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:4193: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4202: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4217: result: no" >&5
-+  echo "$as_me:4205: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4223,7 +4211,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:4226: 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 +4234,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <<EOF
--#line 4249 "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:4240: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4255: \$? = $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 +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}:4254: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -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:4262: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -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: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 +4283,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:4298: result: $DESTDIR" >&5
-+echo "$as_me:4286: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -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: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 +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:4329: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:4337: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:4352: result: no" >&5
-+  echo "$as_me:4340: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4357,12 +4345,12 @@
- done
- 
- fi;
--	echo "$as_me:4360: 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: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: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 +4360,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:4375: 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: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 +4371,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:4386: 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: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 +4382,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:4397: 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: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 +4393,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:4408: 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: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 +4404,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:4419: 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 +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: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 +4439,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:4454: 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 +4456,7 @@
-   cf_libtool_version=yes
- 
- fi;
--echo "$as_me:4471: 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 +4481,7 @@
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4496: 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 +4491,7 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4506: result: $with_libtool" >&5
-+echo "$as_me:4494: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-@@ -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: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 +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: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 +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:4552: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -4572,20 +4560,20 @@
- LIBTOOL=$ac_cv_path_LIBTOOL
- 
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4575: 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:4566: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	fi
- 	if test -z "$LIBTOOL" ; then
--		{ { echo "$as_me:4584: 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; }; }
- 	fi
--	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
-+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
- 	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
- 	LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -4596,17 +4584,17 @@
- 	LIB_PREP=:
- 
- 	# Show the version of libtool
--	echo "$as_me:4599: checking version of libtool" >&5
-+	echo "$as_me:4587: checking version of libtool" >&5
- echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
- 
- 	# Save the version in a cache variable - this is not entirely a good
- 	# thing, but the version string from libtool is very ugly, and for
- 	# bug reports it might be useful to have the original string. "("
- 	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: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: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 +4602,7 @@
- 	# special hack to add -no-undefined (which libtool should do for itself)
- 	LT_UNDEF=
- 	case "$cf_cv_system_name" in #(vi
--	cygwin*|mingw32*|uwin*|aix[456]) #(vi
-+	cygwin*|mingw32*|uwin*|aix[4-7]) #(vi
- 		LT_UNDEF=-no-undefined
- 		;;
- 	esac
-@@ -4642,7 +4630,7 @@
- 
- else
- 
--echo "$as_me:4645: 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 +4640,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:4655: 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: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 +4654,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:4669: 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: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 +4668,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:4683: 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: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 +4682,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:4697: 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 +4690,19 @@
- 
- ###############################################################################
- 
--echo "$as_me:4705: 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:4697: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:4714: 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: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 +4716,22 @@
- LIB_DIR=../lib
- LIB_2ND=../../lib
- 
-+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
-+
-+# Check whether --with-lib-prefix or --without-lib-prefix was given.
-+if test "${with_lib_prefix+set}" = set; then
-+  withval="$with_lib_prefix"
-+  with_lib_prefix=$withval
-+else
-+  with_lib_prefix=auto
-+fi;
-+echo "$as_me:4729: result: $with_lib_prefix" >&5
-+echo "${ECHO_T}$with_lib_prefix" >&6
-+
-+if test $with_lib_prefix = auto
-+then
-+
- 	case $cf_cv_system_name in #(vi
- 	OS/2*|os2*) #(vi
-         LIB_PREFIX=''
-@@ -4737,13 +4741,18 @@
- 	esac
- cf_prefix=$LIB_PREFIX
- 
--LIB_PREFIX=$cf_prefix
-+elif test $with_lib_prefix = no
-+then
-+	LIB_PREFIX=
-+else
-+	LIB_PREFIX=$with_lib_prefix
-+fi
- 
- LIB_SUFFIX=
- 
- ###############################################################################
- 
--echo "$as_me:4746: 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 +4762,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:4756: 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: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 +4775,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:4769: result: $with_ticlib" >&5
-+echo "$as_me:4778: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:4775: 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 +4791,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:4785: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4795 "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:4808: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4805: \$? = $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 +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: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 +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}:4844: testing assuming we really have GPM library ..." 1>&5
- 
- 			cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:4842: 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 +4856,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4850 "configure"
-+#line 4859 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:4878: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4872: \$? = $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:4884: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4878: \$? = $ac_status" >&5
-+  echo "$as_me:4887: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -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: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
-   :
- else
- 
--				{ { echo "$as_me:4895: 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 +4911,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:4905: 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 +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: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 +4930,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:4924: result: $with_dlsym" >&5
-+	echo "$as_me:4933: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "$with_dlsym" = yes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:4929: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4935 "configure"
-+#line 4944 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -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:4975: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4969: \$? = $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:4981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4975: \$? = $ac_status" >&5
-+  echo "$as_me:4984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -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:4994: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:4992: 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 +5006,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5000 "configure"
-+#line 5009 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5028: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5022: \$? = $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:5034: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5028: \$? = $ac_status" >&5
-+  echo "$as_me:5037: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -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: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 +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: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 5064 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -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:5082: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5076: \$? = $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:5088: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5082: \$? = $ac_status" >&5
-+  echo "$as_me:5091: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cat >>confdefs.h <<\EOF
-@@ -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:5102: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5098: 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:5110: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -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}:5118: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5114: 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 +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:5141: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5135: \$? = $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:5146: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5140: \$? = $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 +5157,7 @@
- fi
- 
- fi
--echo "$as_me:5151: 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 +5174,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5168: 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 +5182,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5176 "configure"
-+#line 5185 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5204: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5198: \$? = $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:5210: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5204: \$? = $ac_status" >&5
-+  echo "$as_me:5213: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -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: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: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 +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:5252: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5246: \$? = $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:5257: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5251: \$? = $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 +5269,11 @@
- fi
- 
- fi
--echo "$as_me:5263: 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: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 +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: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 +5295,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5289 "configure"
-+#line 5298 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -5309,16 +5318,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5312: \"$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: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:5327: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5321: \$? = $ac_status" >&5
-+  echo "$as_me:5330: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -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: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 +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: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 +5364,13 @@
- profile) LD_MODEL='-pg';;
- shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5358: result: $LD_MODEL" >&5
-+echo "$as_me:5367: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- shared)
- 
--echo "$as_me:5364: 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 +5380,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5374: 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: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 +5393,13 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5387: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5396: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
- 
- LD_RPATH_OPT=
--echo "$as_me:5393: 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 +5412,10 @@
- linux*|gnu*|k*bsd*-gnu) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--openbsd[2-9].*) #(vi
-+openbsd[2-9].*|mirbsd*) #(vi
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
- 	LD_RPATH_OPT="-rpath "
- 	;;
- netbsd*) #(vi
-@@ -5421,17 +5430,17 @@
- *)
- 	;;
- esac
--echo "$as_me:5424: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5433: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in #(vi
- x-R*)
--	echo "$as_me:5429: 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"
- 	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5434 "configure"
-+#line 5443 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:5455: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5449: \$? = $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:5461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5455: \$? = $ac_status" >&5
-+  echo "$as_me:5464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -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: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 +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: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 +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: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 +5510,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5504: 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 +5519,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:5513: 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"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5520 "configure"
-+#line 5529 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -5529,16 +5538,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5532: \"$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: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:5547: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5541: \$? = $ac_status" >&5
-+  echo "$as_me:5550: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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:5559: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -5555,10 +5564,14 @@
- 	cf_cv_shlib_version_infix=no
- 
- 	case $cf_cv_system_name in #(vi
--	aix[56]*) #(vi
-+	aix4.3-9*|aix[5-7]*) #(vi
- 		if test "$GCC" = yes; then
- 			CC_SHARED_OPTS=
--			MK_SHARED_LIB='$(CC) -shared'
-+			MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
-+		else
-+			# CC_SHARED_OPTS='-qpic=large -G'
-+			# perhaps "-bM:SRE -bnoentry -bexpall"
-+			MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
- 		fi
- 		;;
- 	beos*) #(vi
-@@ -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: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 +5611,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5601 "configure"
-+#line 5614 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:5626: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5616: \$? = $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:5632: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5622: \$? = $ac_status" >&5
-+  echo "$as_me:5635: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -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: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 +5662,19 @@
- 		# readonly to exploit a quirk in the memory manager.
- 		INSTALL_LIB="-m 555"
- 		;;
-+	interix*)
-+		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-+		if test "$cf_cv_shlib_version" = rel; then
-+			cf_shared_soname='`basename  .${REL_VERSION}`.${ABI_VERSION}'
-+		else
-+			cf_shared_soname='`basename `'
-+		fi
-+		CC_SHARED_OPTS=
-+		MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o '
-+		;;
- 	irix*) #(vi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		# tested with IRIX 5.2 and 'cc'.
- 		if test "$GCC" != yes; then
-@@ -5668,7 +5691,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 
- 	test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -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
- 			LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_enable_rpath" = yes ; then
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 
-@@ -5704,12 +5748,12 @@
- 		MK_SHARED_LIB='${LD} -Bshareable -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
- 		;;
--	freebsd*) #(vi
-+	dragonfly*|freebsd*) #(vi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
- 			LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
--			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 		fi
- 
- 	test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -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)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
--			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"
-+			EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
- 			if test "$cf_cv_shlib_version" = auto; then
- 			if test -f /usr/libexec/ld.elf_so; then
- 				cf_cv_shlib_version=abi
-@@ -5810,7 +5854,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 5813 "configure"
-+#line 5857 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -5822,16 +5866,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5825: \"$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: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:5875: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5834: \$? = $ac_status" >&5
-+  echo "$as_me:5878: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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:5915: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
- 		;;
- 	esac
- 
--	if test -n "$cf_ld_rpath_opt" ; then
--		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
--	fi
-+	# RPATH_LIST is a colon-separated list of directories
-+	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
- 	for model in $cf_list_models; do
- 		if test "$model" = "shared"; then
--			{ { echo "$as_me:5885: 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 +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: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 +5961,21 @@
-   cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:5912: 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: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:5971: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:5926: 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 +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:5993: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:6001: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:5952: result: no" >&5
-+  echo "$as_me:6004: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5963,7 +6015,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5966 "configure"
-+#line 6018 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -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:6030: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5981: \$? = $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:6036: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5987: \$? = $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 +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}: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 +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}: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}:6083: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -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}:6120: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -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}: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}:6137: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -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}:6174: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -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}: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}: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: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 +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: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: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 +6222,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:6173: 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 +6234,12 @@
- 	;;
- esac
- 
--	case $cf_cv_system_name in
--	os2*)	PATH_SEPARATOR=';'  ;;
--	*)	PATH_SEPARATOR=':'  ;;
--	esac
--
- if test "$use_database" != no ; then
- 	cat >>confdefs.h <<\EOF
- #define USE_DATABASE 1
- EOF
- 
--	echo "$as_me:6195: 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 +6247,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:6203: 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: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 +6260,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:6216: result: $with_hashed_db" >&5
-+	echo "$as_me:6263: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:6222: 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 +6276,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:6232: 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: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 +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:6297: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
-+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
-+
-+# Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-+if test "${with_xterm_kbs+set}" = set; then
-+  withval="$with_xterm_kbs"
-+  with_xterm_kbs=$withval
-+else
-+  with_xterm_kbs=BS
-+fi;
-+case x$with_xterm_kbs in
-+xyes|xno|xBS|xbs|x8)
-+	with_xterm_kbs=BS
-+	;;
-+xDEL|xdel|x127)
-+	with_xterm_kbs=DEL
-+	;;
-+*)
-+	with_xterm_kbs=$withval
-+	;;
-+esac
-+echo "$as_me:6322: result: $with_xterm_kbs" >&5
-+echo "${ECHO_T}$with_xterm_kbs" >&6
-+XTERM_KBS=$with_xterm_kbs
-+
- MAKE_TERMINFO=
- if test "$use_database" = no ; then
- 	TERMINFO="${datadir}/terminfo"
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:6260: 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
- 
-+	case $cf_cv_system_name in
-+	os2*)	PATH_SEPARATOR=';'  ;;
-+	*)	PATH_SEPARATOR=':'  ;;
-+	esac
-+
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
- if test "${with_terminfo_dirs+set}" = set; then
-   withval="$with_terminfo_dirs"
-@@ -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: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 +6387,13 @@
- 
- eval 'TERMINFO_DIRS="$cf_dst_path"'
- 
--echo "$as_me:6313: 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
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:6319: 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.
-@@ -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:6432: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -6361,7 +6438,7 @@
- fi
- TERMINFO="$withval"
- 
--echo "$as_me:6364: result: $TERMINFO" >&5
-+echo "$as_me:6441: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- cat >>confdefs.h <<EOF
- #define TERMINFO "$TERMINFO"
-@@ -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: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 +6460,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6386 "configure"
-+#line 6463 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -6397,15 +6474,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6400: \"$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:6480: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6405: \"$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:6485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -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: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 +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: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 +6517,8 @@
- 		eval with_big_strings=no
- 		;;
- 	*) #(vi
--		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
--			| $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
-+		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \
-+			| $AWK '{ printf "%d\n", length($0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
- 			eval with_big_strings=yes
- 		else
- 			eval with_big_strings=no
-@@ -6450,14 +6527,14 @@
- 	esac
- 
- fi;
--echo "$as_me:6453: result: $with_big_strings" >&5
-+echo "$as_me:6530: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
- 
- ###	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: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 +6544,13 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:6470: result: $with_termcap" >&5
-+echo "$as_me:6547: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- if test "$with_termcap" != "yes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:6476: 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 +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: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 +6571,7 @@
- #define USE_TERMCAP 1
- EOF
- 
--echo "$as_me:6497: 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.
-@@ -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: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 +6624,14 @@
- 
- eval 'TERMPATH="$cf_dst_path"'
- 
--echo "$as_me:6550: result: $TERMPATH" >&5
-+echo "$as_me:6627: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- test -n "$TERMPATH" && cat >>confdefs.h <<EOF
- #define TERMPATH "$TERMPATH"
- EOF
- 
- ###	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: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 +6641,13 @@
- else
-   with_getcap=no
- fi;
--echo "$as_me:6567: 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
- #define USE_GETCAP 1
- EOF
- 
--echo "$as_me:6573: 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 +6657,7 @@
- else
-   with_getcap_cache=no
- fi;
--echo "$as_me:6583: 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 +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: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 +6676,13 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:6602: 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
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:6608: 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 +6692,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:6618: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6638 "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.  */
-@@ -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:6746: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6672: \$? = $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:6752: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6678: \$? = $ac_status" >&5
-+  echo "$as_me:6755: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6711 "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.  */
-@@ -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:6819: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6745: \$? = $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:6825: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6751: \$? = $ac_status" >&5
-+  echo "$as_me:6828: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -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: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 +6846,7 @@
- done
- 
- else
--	echo "$as_me:6772: 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 +6859,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6785 "configure"
-+#line 6862 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -6812,15 +6889,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6815: \"$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:6895: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6820: \"$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:6900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -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: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 +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: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 +6943,21 @@
- else
-   with_symlinks=no
- fi;
--    echo "$as_me:6869: result: $with_symlinks" >&5
-+    echo "$as_me:6946: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--    echo "$as_me:6876: 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
- 	with_links=yes
-     else
- 	with_links=no
-     fi
--    echo "$as_me:6883: result: $with_links" >&5
-+    echo "$as_me:6960: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -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: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 +6980,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:6906: 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 +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}:7003: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   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: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 +7017,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:6943: 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 +7039,7 @@
- cf_xopen_source=
- 
- case $host_os in #(vi
--aix[456]*) #(vi
-+aix[4-7]*) #(vi
- 	cf_xopen_source="-D_ALL_SOURCE"
- 	;;
- cygwin) #(vi
-@@ -6973,6 +7050,7 @@
- 	;;
- darwin*) #(vi
- 	cf_xopen_source="-D_DARWIN_C_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- freebsd*|dragonfly*) #(vi
- 	# 5.x headers associate
-@@ -6990,17 +7068,18 @@
- 	;;
- irix[56].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 
--echo "$as_me:6996: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7003 "configure"
-+#line 7082 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7015,16 +7094,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7018: \"$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: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:7103: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7027: \$? = $ac_status" >&5
-+  echo "$as_me:7106: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7033,7 +7112,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7036 "configure"
-+#line 7115 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7048,16 +7127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7051: \"$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: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:7136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7060: \$? = $ac_status" >&5
-+  echo "$as_me:7139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -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: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"
- 
- 	;;
- mirbsd*) #(vi
--	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
--	;;
--netbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
--	;;
--openbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
--	;;
--osf[45]*) #(vi
--	cf_xopen_source="-D_OSF_SOURCE"
--	;;
--nto-qnx*) #(vi
--	cf_xopen_source="-D_QNX_SOURCE"
--	;;
--sco*) #(vi
--	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
--	;;
--solaris2.1[0-9]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	;;
--solaris2.[1-9]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__"
--	;;
--*)
--	echo "$as_me:7105: 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
-+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
-+	cf_XOPEN_SOURCE=
-+
-+cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-+
-+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'`
-+
-+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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+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 7185 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
- main ()
- {
- 
--#ifndef _XOPEN_SOURCE
-+#ifndef _POSIX_C_SOURCE
- make an error
- #endif
-   ;
-@@ -7124,32 +7197,44 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7127: \"$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: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:7206: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7136: \$? = $ac_status" >&5
-+  echo "$as_me:7209: \$? = $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
--cf_save="$CPPFLAGS"
--	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	 cat >conftest.$ac_ext <<_ACEOF
--#line 7145 "configure"
-+cf_want_posix_source=no
-+	 case .$cf_POSIX_C_SOURCE in #(vi
-+	 .[12]??*) #(vi
-+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
-+		;;
-+	 .2) #(vi
-+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
-+		cf_want_posix_source=yes
-+		;;
-+	 .*)
-+		cf_want_posix_source=yes
-+		;;
-+	 esac
-+	 if test "$cf_want_posix_source" = yes ; then
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 7230 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
- main ()
- {
- 
--#ifdef _XOPEN_SOURCE
-+#ifdef _POSIX_SOURCE
- make an error
- #endif
-   ;
-@@ -7157,50 +7242,87 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7160: \"$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: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:7251: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7169: \$? = $ac_status" >&5
-+  echo "$as_me:7254: \$? = $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
-+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"
-+	 fi
-+
-+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"
-+
-+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 7273 "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:7288: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7291: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7294: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7297: \$? = $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"
-+	 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
-+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=
- 
--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)
-@@ -7273,9 +7395,217 @@
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
--	fi
-+fi
- 
--cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-+	;;
-+netbsd*) #(vi
-+	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	;;
-+openbsd[4-9]*) #(vi
-+	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
-+	cf_xopen_source="-D_BSD_SOURCE"
-+	cf_XOPEN_SOURCE=600
-+	;;
-+openbsd*) #(vi
-+	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-+	;;
-+osf[45]*) #(vi
-+	cf_xopen_source="-D_OSF_SOURCE"
-+	;;
-+nto-qnx*) #(vi
-+	cf_xopen_source="-D_QNX_SOURCE"
-+	;;
-+sco*) #(vi
-+	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
-+	;;
-+solaris2.*) #(vi
-+	cf_xopen_source="-D__EXTENSIONS__"
-+	;;
-+*)
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 7433 "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:7452: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7455: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7458: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7461: \$? = $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 7470 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7492: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7495: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7498: \$? = $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"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:7513: 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"
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+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*)
-+			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
-+
-+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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:7297: 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 7630 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7312,16 +7642,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7315: \"$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: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:7651: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7324: \$? = $ac_status" >&5
-+  echo "$as_me:7654: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -7342,14 +7672,362 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7345 "configure"
-+#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"
-+	 CPPFLAGS="$cf_save_CPPFLAGS"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:7758: 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[^=]*='\''\"[^"]*//'`
-+
-+			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
-+
-+	;;
-+esac
-+
-+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_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*)
-+			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: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 7934 "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:7949: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7952: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7955: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7958: \$? = $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: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 7972 "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:7987: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7990: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7993: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:7996: \$? = $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: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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 8019 "configure"
- #include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
-+
- int
- main ()
- {
- 
--#ifdef _POSIX_SOURCE
-+#ifndef _XOPEN_SOURCE
- 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
--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 7388 "configure"
-+#line 8056 "configure"
- #include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
-+
- int
- main ()
- {
- 
--#ifndef _POSIX_C_SOURCE
-+#ifdef _XOPEN_SOURCE
- 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
--cf_cv_posix_c_source=no
-+cf_cv_xopen_source=$cf_XOPEN_SOURCE
- 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: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" | \
--	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"
- 
- 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)
-@@ -7597,16 +8191,19 @@
- 
- fi
- 
-+	fi
-+fi
-+
- # Work around breakage on OS X
- 
--echo "$as_me:7602: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7609 "configure"
-+#line 8206 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7621,23 +8218,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7624: \"$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: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:8227: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7633: \$? = $ac_status" >&5
-+  echo "$as_me:8230: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 7640 "configure"
-+#line 8237 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -7655,16 +8252,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7658: \"$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: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:8261: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7667: \$? = $ac_status" >&5
-+  echo "$as_me:8264: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -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: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: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 +8290,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7696 "configure"
-+#line 8293 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -7715,16 +8312,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7718: \"$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: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:8321: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7727: \$? = $ac_status" >&5
-+  echo "$as_me:8324: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -7738,7 +8335,7 @@
- done
- 
- fi
--echo "$as_me:7741: 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 +8345,13 @@
- 
- # Checks for CODESET support.
- 
--  echo "$as_me:7751: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7757 "configure"
-+#line 8354 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -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:8366: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7772: \$? = $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:8372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7778: \$? = $ac_status" >&5
-+  echo "$as_me:8375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -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: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 +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: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 +8407,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:7813: 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 +8415,63 @@
- #define USE_WIDEC_SUPPORT 1
- EOF
- 
--	case "$CFLAGS $CPPFLAGS" in #(vi
--	*-D_XOPEN_SOURCE=500) #(vi
--		;;
--	*)
-+	cat >>confdefs.h <<\EOF
-+#define NCURSES_WIDECHAR 1
-+EOF
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 8429 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <wchar.h>
-+
-+int
-+main ()
-+{
-+
-+	wint_t foo = 0;
-+	int bar = iswpunct(foo)
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8449: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8455: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_wchar_h_okay=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_wchar_h_okay=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:8465: result: $cf_cv_wchar_h_okay" >&5
-+echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
-+
-+if test $cf_cv_wchar_h_okay = no
-+then
- 
--echo "$as_me:7826: 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 8474 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -7842,16 +8487,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7845: \"$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: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:8496: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7854: \$? = $ac_status" >&5
-+  echo "$as_me:8499: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -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:8508: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:7869: 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 8517 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -7885,16 +8530,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7888: \"$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: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:8539: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7897: \$? = $ac_status" >&5
-+  echo "$as_me:8542: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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: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 +8556,7 @@
- 	fi
- fi
- 
--		;;
--	esac
-+fi
- 
- 	# with_overwrite=no
- 	NCURSES_CH_T=cchar_t
-@@ -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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7929 "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.  */
-@@ -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:8604: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7963: \$? = $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:8610: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7969: \$? = $ac_status" >&5
-+  echo "$as_me:8613: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -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: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 +8632,7 @@
- 
- 	if test "$ac_cv_func_putwc" != yes ; then
- 
--echo "$as_me:7991: 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 +8640,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7999 "configure"
-+#line 8643 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -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:8656: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8015: \$? = $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:8662: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8021: \$? = $ac_status" >&5
-+  echo "$as_me:8665: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -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}:8677: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8038 "configure"
-+#line 8682 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:8695: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8054: \$? = $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:8701: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8060: \$? = $ac_status" >&5
-+  echo "$as_me:8704: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -8071,7 +8715,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8074 "configure"
-+#line 8718 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:8731: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8090: \$? = $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:8737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8096: \$? = $ac_status" >&5
-+  echo "$as_me:8740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -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}: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}:8759: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-     cf_save_CPPFLAGS="$CPPFLAGS"
-     cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -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}: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 8876 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -8242,21 +8886,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8245: \"$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: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:8895: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8254: \$? = $ac_status" >&5
-+  echo "$as_me:8898: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:8259: 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 +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}:8921: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-       cf_save_LIBS="$LIBS"
-       cf_save_LDFLAGS="$LDFLAGS"
-@@ -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}:9018: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
-             CPPFLAGS="$cf_test_CPPFLAGS"
-             LIBS="-lutf8  $cf_save_LIBS"
-             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
-             cat >conftest.$ac_ext <<_ACEOF
--#line 8380 "configure"
-+#line 9024 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:9037: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8396: \$? = $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:9043: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8402: \$? = $ac_status" >&5
-+  echo "$as_me:9046: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:8407: 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 +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: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 +9124,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8483 "configure"
-+#line 9127 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8492,16 +9136,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8495: \"$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: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:9145: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8504: \$? = $ac_status" >&5
-+  echo "$as_me:9148: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:9165: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -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}:9199: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8579 "configure"
-+#line 9223 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8594,23 +9238,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8597: \"$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: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:9247: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8606: \$? = $ac_status" >&5
-+  echo "$as_me:9250: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 8613 "configure"
-+#line 9257 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8629,16 +9273,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8632: \"$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: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:9282: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8641: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8677 "configure"
-+#line 9321 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8692,23 +9336,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8695: \"$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: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:9345: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8704: \$? = $ac_status" >&5
-+  echo "$as_me:9348: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 8711 "configure"
-+#line 9355 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8727,16 +9371,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8730: \"$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: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:9380: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8739: \$? = $ac_status" >&5
-+  echo "$as_me:9383: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8780 "configure"
-+#line 9424 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8795,23 +9439,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8798: \"$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: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:9448: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8807: \$? = $ac_status" >&5
-+  echo "$as_me:9451: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 8814 "configure"
-+#line 9458 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8830,16 +9474,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8833: \"$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: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:9483: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8842: \$? = $ac_status" >&5
-+  echo "$as_me:9486: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -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: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 +9534,7 @@
- 	;;
- esac
- 
--echo "$as_me:8893: 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 +9544,7 @@
- else
-   with_lp64=$default_with_lp64
- fi;
--echo "$as_me:8903: 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 +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: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 +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 9575 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8948,16 +9592,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8951: \"$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: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:9601: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8960: \$? = $ac_status" >&5
-+  echo "$as_me:9604: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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:9614: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8973: \$? = $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:9620: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8979: \$? = $ac_status" >&5
-+  echo "$as_me:9623: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -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: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
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:8999: 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 +9648,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9007 "configure"
-+#line 9651 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -9024,16 +9668,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9027: \"$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: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:9677: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9036: \$? = $ac_status" >&5
-+  echo "$as_me:9680: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9042,7 +9686,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9045 "configure"
-+#line 9689 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -9063,16 +9707,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9066: \"$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: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:9716: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9075: \$? = $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 +9727,7 @@
-   break
- done
- fi
--echo "$as_me:9086: 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 +9737,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:9096: 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 +9745,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9104 "configure"
-+#line 9748 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -9121,16 +9765,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9124: \"$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: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:9774: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9133: \$? = $ac_status" >&5
-+  echo "$as_me:9777: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9139,7 +9783,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9142 "configure"
-+#line 9786 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -9160,16 +9804,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9163: \"$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: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:9813: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9172: \$? = $ac_status" >&5
-+  echo "$as_me:9816: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -9180,7 +9824,7 @@
-   break
- done
- fi
--echo "$as_me:9183: 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 +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: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 +9845,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9204 "configure"
-+#line 9848 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9213,16 +9857,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9216: \"$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: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:9866: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9225: \$? = $ac_status" >&5
-+  echo "$as_me:9869: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9231,7 +9875,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9234 "configure"
-+#line 9878 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -9244,16 +9888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9247: \"$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: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:9897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9256: \$? = $ac_status" >&5
-+  echo "$as_me:9900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -9264,7 +9908,7 @@
-   break
- done
- fi
--echo "$as_me:9267: 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 +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:9925: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9287 "configure"
-+#line 9931 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -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:9943: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9302: \$? = $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:9949: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9308: \$? = $ac_status" >&5
-+  echo "$as_me:9952: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9346 "configure"
-+#line 9990 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9364,16 +10008,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9367: \"$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: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:10017: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9376: \$? = $ac_status" >&5
-+  echo "$as_me:10020: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -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: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 +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: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 +10047,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:9406: 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
- test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:9413: 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 +10064,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:9423: result: $with_tic_depends" >&5
-+echo "$as_me:10067: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:9430: 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 +10081,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:9440: 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: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 +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: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: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 +10109,11 @@
- else
-   NCURSES_CHTYPE=auto
- fi;
--echo "$as_me:9468: 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: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 +10123,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:9482: 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: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 +10137,11 @@
- else
-   NCURSES_MMASK_T=auto
- fi;
--echo "$as_me:9496: 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: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 +10151,25 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:9510: 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: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 +10179,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:9524: 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 +10187,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:9532: 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 +10276,14 @@
-   ;;
- esac
- 
--echo "$as_me:9621: 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: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: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 +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: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 +10325,10 @@
-   fi
- fi
- 
--echo "$as_me:9670: 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: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 +10339,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:9684: 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 +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: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 +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:10369: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:9717: 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: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 +10387,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:9732: result: $MANPAGE_TBL" >&5
-+echo "$as_me:10390: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
-   if test "$prefix" = "NONE" ; then
-@@ -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
- cat >>$cf_edit_man <<CF_EOF
--	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
-+	nCurses=ignore.3x
-+	test $with_curses_h = yes && nCurses=ncurses.3x
-+	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\`
- CF_EOF
- fi
- 
-@@ -9915,6 +10576,13 @@
- fi
- CF_EOF
- 
-+if test $with_overwrite != yes ; then
-+cat >>$cf_edit_man <<CF_EOF
-+	sed -e "/\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
-+	mv \$TMP.out \$TMP
-+CF_EOF
-+fi
-+
- if test $with_curses_h != yes ; then
- cat >>$cf_edit_man <<CF_EOF
- 	sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-@@ -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: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 +10729,15 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:10064: 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
- 	NCURSES_EXT_FUNCS=1
- 	cat >>confdefs.h <<\EOF
-+#define HAVE_ASSUME_DEFAULT_COLORS 1
-+EOF
-+
-+	cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_VERSION 1
- EOF
- 
-@@ -10090,6 +10762,14 @@
- EOF
- 
- 	cat >>confdefs.h <<\EOF
-+#define HAVE_USE_SCREEN 1
-+EOF
-+
-+	cat >>confdefs.h <<\EOF
-+#define HAVE_USE_WINDOW 1
-+EOF
-+
-+	cat >>confdefs.h <<\EOF
- #define HAVE_WRESIZE 1
- EOF
- 
-@@ -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: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 +10793,7 @@
- else
-   with_sp_funcs=no
- fi;
--echo "$as_me:10116: 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 +10807,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:10130: 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 +10817,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:10140: 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 +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: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; }; }
- 	fi
- fi
- 
- ###   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: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 +10842,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:10165: 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 +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: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 +10860,12 @@
- else
-   with_ext_colors=no
- fi;
--echo "$as_me:10183: 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
- if test "$with_ext_colors" = yes ; then
- 	if test "$with_widec" != yes ; then
--		{ { echo "$as_me:10188: 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 +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: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 +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: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 +10901,7 @@
- else
-   with_ext_mouse=no
- fi;
--echo "$as_me:10224: 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 +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: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 +10920,7 @@
- 
- fi
- 
--echo "$as_me:10243: 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 +10930,19 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:10253: 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
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:10259: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10265 "configure"
-+#line 10945 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -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:10953: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10279: \$? = $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 +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 10981 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -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 10999 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -10337,7 +11017,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10340 "configure"
-+#line 11020 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -10363,15 +11043,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10366: \"$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:11049: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:10371: \"$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:11054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10384,7 +11064,7 @@
- fi
- fi
- fi
--echo "$as_me:10387: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10409 "configure"
-+#line 11089 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10415: \"$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: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:11101: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10424: \$? = $ac_status" >&5
-+  echo "$as_me:11104: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -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: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 +11121,13 @@
- fi
- done
- 
--echo "$as_me:10444: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10450 "configure"
-+#line 11130 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -10462,16 +11142,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10465: \"$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: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:11151: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10474: \$? = $ac_status" >&5
-+  echo "$as_me:11154: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -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: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: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 +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 11176 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -10505,21 +11185,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10508: \"$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: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:11194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10517: \$? = $ac_status" >&5
-+  echo "$as_me:11197: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 10522 "configure"
-+#line 11202 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -10531,16 +11211,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10534: \"$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: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:11220: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10543: \$? = $ac_status" >&5
-+  echo "$as_me:11223: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -10556,7 +11236,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 10559 "configure"
-+#line 11239 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -10568,16 +11248,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10571: \"$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: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:11257: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10580: \$? = $ac_status" >&5
-+  echo "$as_me:11260: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -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 11276 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -10605,16 +11285,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10608: \"$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: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:11294: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10617: \$? = $ac_status" >&5
-+  echo "$as_me:11297: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -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: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; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10635 "configure"
-+#line 11315 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -10648,15 +11328,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10651: \"$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:11334: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:10656: \"$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:11339: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -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: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 +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: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 +11373,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:10696: 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"
- 
- ###   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: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 +11388,14 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:10711: 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
- #define USE_SIGWINCH 1
- EOF
- 
- ###   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: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 +11405,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:10728: 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 +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: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 +11423,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:10746: 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: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 +11437,14 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:10760: 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
- #define USE_HARD_TABS 1
- EOF
- 
- ###   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: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 +11454,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:10777: 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 +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: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 +11473,14 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:10796: 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
- #define USE_ASSUMED_COLOR 1
- EOF
- 
- ###   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: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 +11490,14 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:10813: 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
- #define USE_HASHMAP 1
- EOF
- 
- ###   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: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 +11507,14 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:10830: 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
- #define USE_COLORFGBG 1
- EOF
- 
- ###   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: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 +11524,7 @@
- else
-   with_exp_interop=no
- fi;
--echo "$as_me:10847: 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 +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: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 +11543,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:10866: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10876 "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:11560: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10886: \$? = $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 +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: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 +11590,14 @@
- #define HAVE_PTHREADS_H 1
- EOF
- 
--        echo "$as_me:10913: checking if we can link with the pthread library" >&5
--echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
--        cf_save_LIBS="$LIBS"
--        LIBS="-lpthread $LIBS"
--        cat >conftest.$ac_ext <<_ACEOF
--#line 10918 "configure"
-+	for cf_lib_pthread in pthread c_r
-+	do
-+	    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 11600 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -10924,23 +11606,24 @@
- main ()
- {
- 
--        int rc = pthread_create(0,0,0,0);
-+		int rc = pthread_create(0,0,0,0);
-+		int r2 = pthread_mutexattr_settype(0, 0);
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10934: \"$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: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:11623: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10943: \$? = $ac_status" >&5
-+  echo "$as_me:11626: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -10949,34 +11632,36 @@
- with_pthread=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--        LIBS="$cf_save_LIBS"
--        echo "$as_me:10953: result: $with_pthread" >&5
-+	    LIBS="$cf_save_LIBS"
-+	    echo "$as_me:11636: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
-+	    test "$with_pthread" = yes && break
-+	done
- 
--        if test "$with_pthread" = yes ; then
--            LIBS="-lpthread $LIBS"
--            cat >>confdefs.h <<\EOF
-+	if test "$with_pthread" = yes ; then
-+	    LIBS="-l$cf_lib_pthread $LIBS"
-+	    cat >>confdefs.h <<\EOF
- #define HAVE_LIBPTHREADS 1
- EOF
- 
--        else
--            { { echo "$as_me:10963: error: Cannot link with pthread library" >&5
-+	else
-+	    { { 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; }; }
--        fi
-+	fi
- 
- fi
- 
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:10973: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10979 "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.  */
-@@ -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:11695: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11013: \$? = $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:11701: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11019: \$? = $ac_status" >&5
-+  echo "$as_me:11704: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -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: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: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 +11725,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:11043: 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 +11735,7 @@
- 		fi
- fi
- 
--	echo "$as_me:11053: 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 +11745,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:11063: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11074 "configure"
-+#line 11759 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -11097,16 +11782,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11100: \"$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: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:11791: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11109: \$? = $ac_status" >&5
-+  echo "$as_me:11794: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -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:11805: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -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: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 +11843,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:11161: 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 +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: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 +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: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 +11894,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:11212: 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 +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: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 +11914,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:11232: 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 +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: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 +11933,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:11251: 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 +11941,7 @@
- 
- fi
- 
--echo "$as_me:11259: 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 +11951,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:11269: 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,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 $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.
- 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 "${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: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 +12015,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:11307: 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 +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: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"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11324 "configure"
-+#line 12035 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11338,16 +12049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11341: \"$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: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:12058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11350: \$? = $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"
-@@ -11357,15 +12068,64 @@
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11361: result: $INTEL_COMPILER" >&5
--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 12128 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -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: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 +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:12161: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11404: \$? = $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:12166: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -11412,7 +12172,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:11415: 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 +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:12195: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11438: \$? = $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:12200: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in #(vi
- 			Wcast-qual) #(vi
-@@ -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}: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 +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: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"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11476 "configure"
-+#line 12246 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11490,16 +12260,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11493: \"$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: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:12269: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11502: \$? = $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,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:12283: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
- 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 12346 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -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: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 +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:12381: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11565: \$? = $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:12386: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -11573,7 +12392,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:11576: 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 +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:12424: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11608: \$? = $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: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:12433: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -11647,10 +12466,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:11650: 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 12472 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -11699,12 +12518,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:11702: \"$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: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:12526: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in #(vi
-@@ -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: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,16 +12661,12 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:11753: result: $with_assertions" >&5
-+echo "$as_me:12664: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
- 	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: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 +12693,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:11789: 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 +12787,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:11883: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11889 "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:12800: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11899: \$? = $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 +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: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: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 +12834,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11930 "configure"
-+#line 12837 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:12856: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11952: \$? = $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:12862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11958: \$? = $ac_status" >&5
-+  echo "$as_me:12865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -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: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 +12888,7 @@
- 
- fi
- 
--echo "$as_me:11984: 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 +12904,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:12000: 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 +12998,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:12094: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12100 "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:13011: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12110: \$? = $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 +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: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: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 +13045,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12141 "configure"
-+#line 13048 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13067: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12163: \$? = $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:13073: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12169: \$? = $ac_status" >&5
-+  echo "$as_me:13076: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -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: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 +13099,7 @@
- 
- fi
- 
--echo "$as_me:12195: 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 +13115,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:12211: 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 +13208,7 @@
- 	;;
- esac
- 
--echo "$as_me:12304: 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 +13218,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:12314: 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 +13267,7 @@
- 	;;
- esac
- 
--echo "$as_me:12363: 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 +13277,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:12373: 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 +13372,13 @@
- *mingw32*) #(vi
- 	;;
- *)
--echo "$as_me:12468: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12474 "configure"
-+#line 13381 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -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:13412: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12508: \$? = $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:13418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12514: \$? = $ac_status" >&5
-+  echo "$as_me:13421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -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: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 +13437,7 @@
- 
- else
- 
--echo "$as_me:12533: 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 +13445,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12541 "configure"
-+#line 13448 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13467: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12563: \$? = $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:13473: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12569: \$? = $ac_status" >&5
-+  echo "$as_me:13476: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -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: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 +13498,14 @@
- 	;;
- esac
- 
--echo "$as_me:12594: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 12601 "configure"
-+#line 13508 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -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:13523: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12619: \$? = $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:13529: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12625: \$? = $ac_status" >&5
-+  echo "$as_me:13532: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -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: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 +13547,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:12643: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12649 "configure"
-+#line 13556 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -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:13564: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12663: \$? = $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 +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 13592 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -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 13610 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -12721,7 +13628,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12724 "configure"
-+#line 13631 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12747,15 +13654,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12750: \"$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:13660: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12755: \"$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:13665: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12768,7 +13675,7 @@
- fi
- fi
- fi
--echo "$as_me:12771: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12790 "configure"
-+#line 13697 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -12802,16 +13709,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12805: \"$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: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:13718: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12814: \$? = $ac_status" >&5
-+  echo "$as_me:13721: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -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: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 +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: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 +13749,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12845 "configure"
-+#line 13752 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13771: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12867: \$? = $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:13777: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12873: \$? = $ac_status" >&5
-+  echo "$as_me:13780: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -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: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
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:12891: 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 +13803,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12899 "configure"
-+#line 13806 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13825: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12921: \$? = $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:13831: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12927: \$? = $ac_status" >&5
-+  echo "$as_me:13834: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -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: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 +13850,13 @@
- 
- fi
- 
--echo "$as_me:12946: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12952 "configure"
-+#line 13859 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -12965,16 +13872,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12968: \"$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: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:13881: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12977: \$? = $ac_status" >&5
-+  echo "$as_me:13884: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -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: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 +13906,17 @@
- cf_regex_libs="regex re"
- case $host_os in #(vi
- mingw*)
--	cf_regex_libs="regex.dll $cf_regex_libs"
-+	cf_regex_libs="gnurx $cf_regex_libs"
- 	;;
- esac
- 
--echo "$as_me:13006: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13012 "configure"
-+#line 13919 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -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:13950: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13046: \$? = $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:13956: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13052: \$? = $ac_status" >&5
-+  echo "$as_me:13959: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -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: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 +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: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 +13983,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13079 "configure"
-+#line 13986 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:14005: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13101: \$? = $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:14011: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13107: \$? = $ac_status" >&5
-+  echo "$as_me:14014: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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 +14036,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:13132: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13138 "configure"
-+#line 14045 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -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:14076: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13172: \$? = $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:14082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13178: \$? = $ac_status" >&5
-+  echo "$as_me:14085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -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:14095: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:13194: 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 +14106,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13202 "configure"
-+#line 14109 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:14128: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13224: \$? = $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:14134: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13230: \$? = $ac_status" >&5
-+  echo "$as_me:14137: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -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: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 +14158,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:13254: 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: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 +14174,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13270 "configure"
-+#line 14177 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -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:14192: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13288: \$? = $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:14198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13294: \$? = $ac_status" >&5
-+  echo "$as_me:14201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -13308,7 +14215,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13311 "configure"
-+#line 14218 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$cf_regex_hdr>
-@@ -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:14236: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13332: \$? = $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:14242: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13338: \$? = $ac_status" >&5
-+  echo "$as_me:14245: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -13351,11 +14258,11 @@
- esac
- 
- fi
--echo "$as_me:13354: 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: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 +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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 14307 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:14311: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:14317: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+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
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+EOF
-+
-+fi
-+done
-+
-+for ac_header in unistd.h getopt.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13400 "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:14359: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13410: \$? = $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 +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: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 +14391,64 @@
- fi
- done
- 
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cf_cv_getopt_header=none
-+for cf_header in stdio.h stdlib.h unistd.h getopt.h
-+do
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 14404 "configure"
-+#include "confdefs.h"
-+
-+#include <$cf_header>
-+int
-+main ()
-+{
-+int x = optind; char *y = optarg
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14417: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14420: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14423: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14426: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_getopt_header=$cf_header
-+ break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+
-+fi
-+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
-+	cat >>confdefs.h <<\EOF
-+#define HAVE_GETOPT_HEADER 1
-+EOF
-+
-+fi
-+
- # check for ISC (this may also define _POSIX_SOURCE)
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "$ISC" = yes ; then
- 
--echo "$as_me:13443: 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 +14456,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13451 "configure"
-+#line 14459 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:14471: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13466: \$? = $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:14477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13472: \$? = $ac_status" >&5
-+  echo "$as_me:14480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -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: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 +14499,7 @@
- 
- fi
- 
--	echo "$as_me:13494: 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 +14507,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13502 "configure"
-+#line 14510 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:14529: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13524: \$? = $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:14535: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13530: \$? = $ac_status" >&5
-+  echo "$as_me:14538: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -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: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
-   LIBS="-linet $LIBS"
- fi
- fi
- 
--echo "$as_me:13548: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13555 "configure"
-+#line 14563 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13572,16 +14580,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13575: \"$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: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:14589: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13584: \$? = $ac_status" >&5
-+  echo "$as_me:14592: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -13593,7 +14601,7 @@
- 
- fi
- 
--echo "$as_me:13596: 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 +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: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 +14623,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 13618 "configure"
-+#line 14626 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -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:14675: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13670: \$? = $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:14681: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13676: \$? = $ac_status" >&5
-+  echo "$as_me:14684: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -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: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:14704: 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:13701: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13707 "configure"
-+#line 14715 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13762,16 +14770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13765: \"$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: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:14779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13774: \$? = $ac_status" >&5
-+  echo "$as_me:14782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -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: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 +14799,7 @@
- 
- fi
- 
--echo "$as_me:13794: 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 +14807,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13802 "configure"
-+#line 14810 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -13808,16 +14816,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13811: \"$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: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:14825: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13820: \$? = $ac_status" >&5
-+  echo "$as_me:14828: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -13828,7 +14836,7 @@
- done
- 
- fi
--echo "$as_me:13831: 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) ;;
-@@ -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: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 +14871,7 @@
-       cf_save_CFLAGS=$CFLAGS
-       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
-       cat >conftest.$ac_ext <<_ACEOF
--#line 13863 "configure"
-+#line 14874 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -13872,16 +14883,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13875: \"$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: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:14892: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13884: \$? = $ac_status" >&5
-+  echo "$as_me:14895: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -13893,7 +14904,7 @@
-       CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:13896: 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 +14990,7 @@
-   fi
- fi
- 
--echo "$as_me:13982: 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 +15002,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13994 "configure"
-+#line 15005 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -14014,16 +15025,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14017: \"$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: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:15034: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14026: \$? = $ac_status" >&5
-+  echo "$as_me:15037: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -14037,7 +15048,7 @@
- 
- fi
- 
--echo "$as_me:14040: 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 +15056,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:14048: 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 +15066,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14058 "configure"
-+#line 15069 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -14090,15 +15101,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14093: \"$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:15107: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14098: \"$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:15112: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -14113,7 +15124,7 @@
- 
- fi
- 
--echo "$as_me:14116: 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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14135 "configure"
-+#line 15146 "configure"
- #include "confdefs.h"
- 
- int
-@@ -14144,16 +15155,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14147: \"$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: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:15164: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14156: \$? = $ac_status" >&5
-+  echo "$as_me:15167: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -14165,7 +15176,7 @@
- 
- fi
- 
--echo "$as_me:14168: 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 +15192,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:14184: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 14191 "configure"
-+#line 15202 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -14206,16 +15217,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14209: \"$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: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:15226: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14218: \$? = $ac_status" >&5
-+  echo "$as_me:15229: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 14251 "configure"
-+#line 15262 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -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:15277: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14269: \$? = $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:15283: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14275: \$? = $ac_status" >&5
-+  echo "$as_me:15286: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -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: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 +15307,7 @@
- 
- fi
- 
--echo "$as_me:14299: 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 +15315,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 14307 "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:15321: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14313: \$? = $ac_status" >&5
-+  echo "$as_me:15324: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 14320 "configure"
-+#line 15331 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -14330,10 +15341,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:14333: \"$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: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 +15357,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14349 "configure"
-+#line 15360 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -14357,15 +15368,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14360: \"$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:15374: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14365: \"$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:15379: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -14380,7 +15391,7 @@
- 
- fi
- 
--echo "$as_me:14383: 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
-@@ -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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14424 "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.  */
-@@ -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:15468: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14458: \$? = $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:15474: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14464: \$? = $ac_status" >&5
-+  echo "$as_me:15477: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -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: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 +15496,70 @@
- 
- if test "$with_getcap" = "yes" ; then
- 
--echo "$as_me:14486: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14493 "configure"
-+#line 15506 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+	char temp[128];
-+	char *buf = temp;
-+	char *db_array = temp;
-+	cgetent(&buf, &db_array, "vt100");
-+	cgetcap(buf, "tc", '=');
-+	cgetmatch(buf, "tc");
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:15526: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:15529: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:15532: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:15535: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_cgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_cgetent=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+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
-+	then
-+		cat >>confdefs.h <<EOF
-+#define CGETENT_CONST const
- EOF
- 
-+	fi
-+fi
-+
- fi
- 
--echo "$as_me:14542: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14549 "configure"
-+#line 15624 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -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:15636: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14564: \$? = $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:15642: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14570: \$? = $ac_status" >&5
-+  echo "$as_me:15645: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -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: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
- #define HAVE_ISASCII 1
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:14588: 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 15666 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -14602,16 +15677,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14605: \"$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: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:15686: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14614: \$? = $ac_status" >&5
-+  echo "$as_me:15689: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -14619,7 +15694,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14622 "configure"
-+#line 15697 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -14634,20 +15709,20 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14637: \"$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: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:15718: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14646: \$? = $ac_status" >&5
-+  echo "$as_me:15721: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 	 cat >>confdefs.h <<\EOF
--#define SVR4_ACTION 1
-+#define _POSIX_SOURCE 1
- EOF
- 
- else
-@@ -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: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: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 +15747,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14675 "configure"
-+#line 15750 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -14697,15 +15772,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14700: \"$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:15778: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14705: \"$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:15783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14740 "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:15819: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14750: \$? = $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 +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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14790 "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:15869: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14800: \$? = $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 +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: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 +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: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 15915 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -14849,16 +15924,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14852: \"$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: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:15933: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14861: \$? = $ac_status" >&5
-+  echo "$as_me:15936: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -14866,7 +15941,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14869 "configure"
-+#line 15944 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -14880,23 +15955,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14883: \"$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: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:15964: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14892: \$? = $ac_status" >&5
-+  echo "$as_me:15967: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- termios_bad=yes cat >>confdefs.h <<\EOF
--#define SVR4_TERMIO 1
-+#define _POSIX_SOURCE 1
- EOF
- 
- fi
-@@ -14904,19 +15979,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:14907: result: $termios_bad" >&5
-+	echo "$as_me:15982: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:14912: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14919 "configure"
-+#line 15994 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -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:16022: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14950: \$? = $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:16028: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:16031: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -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: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
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:14972: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14979 "configure"
-+#line 16054 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -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:16070: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14998: \$? = $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:16076: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15004: \$? = $ac_status" >&5
-+  echo "$as_me:16079: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -15009,7 +16084,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15012 "configure"
-+#line 16087 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -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:16109: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15037: \$? = $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:16115: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15043: \$? = $ac_status" >&5
-+  echo "$as_me:16118: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -15048,7 +16123,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15051 "configure"
-+#line 16126 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -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:16148: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15076: \$? = $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:16154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15082: \$? = $ac_status" >&5
-+  echo "$as_me:16157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -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:16172: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in #(vi
-@@ -15112,7 +16187,7 @@
- ;;
- esac
- 
--echo "$as_me:15115: 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,68 +16195,10 @@
- 
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
--  echo "$as_me:15123: 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 15129 "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;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15160: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:15163: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:15169: \$? = $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:15179: result: $ac_cv_func_mkstemp" >&5
--echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
--
-+  cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15184 "configure"
-+#line 16201 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15219,15 +16236,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15222: \"$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:16242: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15227: \"$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:16247: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -15242,8 +16259,69 @@
- fi
- 
- fi
--echo "$as_me:15245: 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
- #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: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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:15272: 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; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15277 "configure"
-+#line 16355 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -15291,15 +16369,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15294: \"$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:16375: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15299: \"$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:16380: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -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: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 +16401,13 @@
- fi
- 
- fi
--echo "$as_me:15326: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15332 "configure"
-+#line 16410 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -15351,16 +16429,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15354: \"$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: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:16438: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15363: \$? = $ac_status" >&5
-+  echo "$as_me:16441: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signal=void
- else
-@@ -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:16451: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
- cat >>confdefs.h <<EOF
- #define RETSIGTYPE $ac_cv_type_signal
- EOF
- 
--echo "$as_me:15380: checking for type sigaction_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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 16464 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((intptr_t *) 0)
-+  return 0;
-+if (sizeof (intptr_t))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:16482: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:16488: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_intptr_t=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_intptr_t=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+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
-+  :
-+else
-+
-+cat >>confdefs.h <<EOF
-+#define intptr_t long
-+EOF
-+
-+fi
-+
-+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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15387 "configure"
-+#line 16517 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -15397,16 +16527,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15400: \"$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: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:16536: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15409: \$? = $ac_status" >&5
-+  echo "$as_me:16539: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -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: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
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:15426: 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 +16568,7 @@
-     CPPFLAGS="$cf_save_CPPFLAGS"
-     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-     cat >conftest.$ac_ext <<_ACEOF
--#line 15441 "configure"
-+#line 16571 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -15482,16 +16612,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15485: \"$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: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:16621: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15494: \$? = $ac_status" >&5
-+  echo "$as_me:16624: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -15510,7 +16640,7 @@
- done
- 
- fi
--echo "$as_me:15513: 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 +16657,13 @@
- 	esac
- fi
- 
--echo "$as_me:15530: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15536 "configure"
-+#line 16666 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -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:16697: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15570: \$? = $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:16703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15576: \$? = $ac_status" >&5
-+  echo "$as_me:16706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -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:16716: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:15592: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15598 "configure"
-+#line 16728 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -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:16759: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15632: \$? = $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:16765: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15638: \$? = $ac_status" >&5
-+  echo "$as_me:16768: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -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: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: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 +16789,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15662 "configure"
-+#line 16792 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -15673,15 +16803,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15676: \"$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:16809: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15681: \"$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:16814: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -15694,7 +16824,7 @@
- fi
- 
- fi
--echo "$as_me:15697: 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 +16845,7 @@
- 
- fi
- 
--echo "$as_me:15718: 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,10 +16855,13 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15728 "configure"
-+#line 16858 "configure"
- #include "confdefs.h"
- 
-+#include <stdlib.h>
- #include <stdio.h>
-+#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:16905: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15752: \$? = $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:16910: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15757: \$? = $ac_status" >&5
-+  echo "$as_me:16913: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -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: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
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:15775: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15782 "configure"
-+#line 16938 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -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:16955: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15802: \$? = $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:16961: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15808: \$? = $ac_status" >&5
-+  echo "$as_me:16964: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -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:16974: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:15825: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15832 "configure"
-+#line 16988 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -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:17005: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15852: \$? = $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:17011: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15858: \$? = $ac_status" >&5
-+  echo "$as_me:17014: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -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:17024: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:15875: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15881 "configure"
-+#line 17037 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -15893,16 +17049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15896: \"$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: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:17058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15905: \$? = $ac_status" >&5
-+  echo "$as_me:17061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15936 "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:17096: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15946: \$? = $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 +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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15984 "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.  */
-@@ -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:17171: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16018: \$? = $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:17177: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16024: \$? = $ac_status" >&5
-+  echo "$as_me:17180: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -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: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 +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: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 +17222,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16069: \"$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:17228: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16074: \"$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:17233: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -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:17245: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -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: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
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:16108: 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 +17270,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16117 "configure"
-+#line 17273 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -16211,15 +17367,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16214: \"$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:17373: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16219: \"$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:17378: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -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:17390: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:16240: 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 +17420,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:16267: 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 +17428,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16275 "configure"
-+#line 17431 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:17450: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16297: \$? = $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:17456: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16303: \$? = $ac_status" >&5
-+  echo "$as_me:17459: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -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: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 +17475,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:16322: 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 +17486,7 @@
-     for cf_header in pty.h libutil.h util.h
-     do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 16333 "configure"
-+#line 17489 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -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:17506: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16353: \$? = $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:17512: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16359: \$? = $ac_status" >&5
-+  echo "$as_me:17515: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-         cf_cv_func_openpty=$cf_header
-@@ -16374,7 +17530,7 @@
-     LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:16377: 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 +17582,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 16429 "configure"
-+#line 17585 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -16438,16 +17594,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16441: \"$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: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:17603: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16450: \$? = $ac_status" >&5
-+  echo "$as_me:17606: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:17623: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -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}:17657: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -16509,23 +17665,23 @@
-     fi
- esac
- 
--echo "$as_me:16512: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16518 "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:17678: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16528: \$? = $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 +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: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: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 +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}:17718: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16565 "configure"
-+#line 17721 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -16592,16 +17748,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16595: \"$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: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:17757: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16604: \$? = $ac_status" >&5
-+  echo "$as_me:17760: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -16615,16 +17771,16 @@
- done
- 
- fi
--echo "$as_me:16618: 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:17778: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:16627: 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 +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}:17797: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16644 "configure"
-+#line 17800 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -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:17855: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16702: \$? = $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:17861: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16708: \$? = $ac_status" >&5
-+  echo "$as_me:17864: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -16725,11 +17881,11 @@
- done
- 
- fi
--echo "$as_me:16728: 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: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 +17895,7 @@
- 
- else
- 
--	{ { echo "$as_me:16742: 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 +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: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 +17918,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16765 "configure"
-+#line 17921 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16774,23 +17930,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16777: \"$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: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:17939: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16786: \$? = $ac_status" >&5
-+  echo "$as_me:17942: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 16793 "configure"
-+#line 17949 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -16806,16 +17962,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16809: \"$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: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:17971: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16818: \$? = $ac_status" >&5
-+  echo "$as_me:17974: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -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:17988: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:16834: 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: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 +17999,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16846 "configure"
-+#line 18002 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -16858,16 +18014,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16861: \"$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: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:18023: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16870: \$? = $ac_status" >&5
-+  echo "$as_me:18026: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -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:18039: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:16885: result: no" >&5
-+else	echo "$as_me:18041: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -16904,7 +18060,7 @@
- 	cf_stdcpp_libname=stdc++
- 	;;
- esac
--echo "$as_me:16907: 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 +18069,7 @@
- 	cf_save="$LIBS"
- 	LIBS="-l$cf_stdcpp_libname $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16916 "configure"
-+#line 18072 "configure"
- #include "confdefs.h"
- 
- #include <strstream.h>
-@@ -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:18088: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16935: \$? = $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:18094: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16941: \$? = $ac_status" >&5
-+  echo "$as_me:18097: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -16950,12 +18106,12 @@
- 	LIBS="$cf_save"
- 
- fi
--echo "$as_me:16953: 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"
- fi
- 
--	echo "$as_me:16958: 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 +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:18130: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16977: \$? = $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:18135: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16982: \$? = $ac_status" >&5
-+  echo "$as_me:18138: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -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:18149: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:16996: result: no" >&5
-+  echo "$as_me:18152: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17013,12 +18169,12 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:17016: 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"
- 	LIBS="-l$cf_gpp_libname $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17021 "configure"
-+#line 18177 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -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:18191: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17038: \$? = $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:18197: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17044: \$? = $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 +18216,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 17063 "configure"
-+#line 18219 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -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:18233: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17080: \$? = $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:18239: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17086: \$? = $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 +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:18259: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -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: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 +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 18292 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:17141: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:17147: \$? = $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 +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 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:18330: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:17180: \$? = $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 +18370,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:17217: 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 +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 18383 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:17232: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:17238: \$? = $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 +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 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:18421: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:17271: \$? = $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 +18452,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:17299: 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 +18464,74 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
- 
--for ac_header in iostream typeinfo
-+for ac_header in typeinfo
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 18476 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:18480: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:18486: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+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
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+EOF
-+
-+fi
-+done
-+
-+for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:17314: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17320 "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:18528: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:17330: \$? = $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 +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: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 +18560,11 @@
- fi
- done
- 
--    if test x"$ac_cv_header_iostream" = xyes ; then
--        echo "$as_me:17360: checking if iostream uses std-namespace" >&5
-+if test x"$ac_cv_header_iostream" = xyes ; then
-+	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 18567 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -17377,16 +18581,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17380: \"$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: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:18590: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17389: \$? = $ac_status" >&5
-+  echo "$as_me:18593: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -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:18602: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
--        if test "$cf_iostream_namespace" = yes ; then
--            cat >>confdefs.h <<\EOF
-+	if test "$cf_iostream_namespace" = yes ; then
-+		cat >>confdefs.h <<\EOF
- #define IOSTREAM_NAMESPACE 1
- EOF
- 
--        fi
--    fi
-+	fi
-+fi
- 
--echo "$as_me:17408: 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 +18617,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17416 "configure"
-+#line 18620 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17425,23 +18629,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17428: \"$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: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:18638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17437: \$? = $ac_status" >&5
-+  echo "$as_me:18641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 17444 "configure"
-+#line 18648 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -17457,16 +18661,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17460: \"$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: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:18670: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17469: \$? = $ac_status" >&5
-+  echo "$as_me:18673: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -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:18687: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:17485: 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: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 +18698,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17497 "configure"
-+#line 18701 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -17509,16 +18713,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17512: \"$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: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:18722: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17521: \$? = $ac_status" >&5
-+  echo "$as_me:18725: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -17531,13 +18735,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:17534: 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:18740: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:17540: 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 +18752,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17551 "configure"
-+#line 18755 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17590,15 +18794,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17593: \"$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:18800: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17598: \"$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: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 +18820,36 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:17619: 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
- 	case .$NCURSES_BOOL in #(vi
- 	.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:17625: 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
- fi
- 
--echo "$as_me:17630: 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"
- cf_result="none"
-+
-+# etip.h includes ncurses.h which includes ncurses_dll.h
-+# But ncurses_dll.h is generated - fix here.
-+test -d include || mkdir include
-+test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
-+
- for cf_math in "" MATH_H
- do
- for cf_excp in "" MATH_EXCEPTION
- do
--	CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include"
-+	CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17642 "configure"
-+#line 18852 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -17653,16 +18863,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17656: \"$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: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:18872: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17665: \$? = $ac_status" >&5
-+  echo "$as_me:18875: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -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:18896: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:17691: 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 +18915,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17708 "configure"
-+#line 18918 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -17720,19 +18930,19 @@
- {
- 	value = x;
- }
--void main() { }
-+int main() { }
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17727: \"$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:18940: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17732: \"$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:18945: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -17751,7 +18961,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:17754: 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 +18970,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:17763: 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 +18984,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17777 "configure"
-+#line 18987 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -17818,16 +19028,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17821: \"$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: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:19037: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17830: \$? = $ac_status" >&5
-+  echo "$as_me:19040: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -17845,7 +19055,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:17848: 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 +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: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 +19114,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17907 "configure"
-+#line 19117 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17946,15 +19156,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17949: \"$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:19162: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17954: \"$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: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 +19182,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:17975: 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
- 	case .$NCURSES_BOOL in #(vi
- 	.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:17981: 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
- fi
- 
- 		else
--			echo "$as_me:17987: 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
- 			i?86)	cf_cv_type_of_bool=char	;; #(vi
- 			*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:17993: 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 +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: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 +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: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 +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:19258: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:19267: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:18060: result: no" >&5
-+  echo "$as_me:19270: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$ac_cv_prog_gnat_exists" = no; then
-    cf_ada_make=
-+   cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:18068: 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 | \
- 	grep '[0-9].[0-9][0-9]*' |\
-     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:19284: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in #(vi
--3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi
-+3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) #(vi
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- *)
--	{ echo "$as_me:18081: 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 +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: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 +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:19315: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:19324: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:18116: result: no" >&5
-+  echo "$as_me:19327: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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:19336: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -18150,7 +19361,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--      echo "$as_me:18153: 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
-@@ -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: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 +19400,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:18188: 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 +19412,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:18200: 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 +19460,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:18248: 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 +19469,7 @@
- 	USE_GNAT_SIGINT="#"
- fi
- 
--echo "$as_me:18257: 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 +19500,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:18288: 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 +19513,7 @@
- cf_gnat_libraries=no
- cf_gnat_projects=no
- 
--echo "$as_me:18301: 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 +19581,14 @@
- 	esac
- 	;;
- esac
--echo "$as_me:18369: result: $cf_gnat_projects" >&5
-+echo "$as_me:19584: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:18374: 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:19591: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -18393,7 +19608,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:18396: 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 +19619,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:18407: result: $cf_ada_compiler" >&5
-+echo "$as_me:19622: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:18412: 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.
-@@ -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:19663: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -18454,10 +19669,10 @@
- fi
- ADA_INCLUDE="$withval"
- 
--echo "$as_me:18457: 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: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.
-@@ -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:19711: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -18502,10 +19717,10 @@
- fi
- ADA_OBJECTS="$withval"
- 
--echo "$as_me:18505: 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: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 +19730,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:18518: 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 +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:19764: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -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:19805: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -18625,7 +19840,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:18628: 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 +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: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: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,11 +19876,11 @@
- 		;;
- 	shared) #(vi
- 		case $cf_cv_system_name in
--		aix[56]*) #(vi
-+		aix[5-7]*) #(vi
- 			DFT_LIB_SUFFIX='.a'
- 			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 			;;
--		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: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:19913: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -18711,12 +19926,12 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:18714: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:19929: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- # libtool thinks it can make c++ shared libraries (perhaps only g++)
- if test "$cf_with_cxx" = yes ; then
--echo "$as_me:18719: 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,11 +19956,11 @@
- 		;;
- 	shared) #(vi
- 		case $cf_cv_system_name in
--		aix[56]*) #(vi
-+		aix[5-7]*) #(vi
- 			CXX_LIB_SUFFIX='.a'
- 			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 			;;
--		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:19991: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -18812,9 +20027,11 @@
- 		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
- 		TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
- 	fi
--	TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
-+	TICS_LDFLAGS="-L${LIB_DIR}"
-+	TICS_LIBS="-l${TICS_LIB_SUFFIX}"
- else
--	TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+	TICS_LDFLAGS="-L${LIB_DIR}"
-+	TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
- fi
- 
- if test "$with_termlib" != no ; then
-@@ -18837,14 +20054,22 @@
- 	if test "$DFT_LWR_MODEL" = "libtool"; then
- 		TEST_ARGS="${TEST_DEPS}"
- 		TEST_ARG2="${TEST_DEP2}"
--		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+		TINFO_LDFLAGS="-L${LIB_DIR}"
-+		TINFO_LIBS="$TEST_ARGS"
- 		TICS_LIST="$SHLIB_LIST $TEST_ARGS"
- 		SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
- 	else
- 		TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
- 		TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
--		TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
--		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+		if test "x$with_term_driver" != xno ; then
-+			TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+			TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+			TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+		else
-+			TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
-+			TINFO_LIBS="$TEST_ARGS"
-+		fi
-+		TINFO_LDFLAGS="-L${LIB_DIR}"
- 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- 	fi
- else
-@@ -18858,7 +20083,8 @@
- 		TICS_LIST="$SHLIB_LIST"
- 	fi
- 
--	TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+	TINFO_LDFLAGS="-L${LIB_DIR}"
-+	TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
- fi
- 
- if test "$DFT_LWR_MODEL" = shared ; then
-@@ -18882,7 +20108,7 @@
- fi
- 
- # needed for Ada95
--TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
-+TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
- 
- case $DFT_LWR_MODEL in
- normal|debug|profile)
-@@ -18900,7 +20126,7 @@
-     esac
- else
- 	case $cf_cv_system_name in #(
--	aix[456]*) 	#( from ld manpage
-+	aix[4-7]*) 	#( from ld manpage
- 		LDFLAGS_STATIC=-bstatic
- 		LDFLAGS_SHARED=-bdynamic
- 		;;
-@@ -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:20156: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 18935 "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:20165: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18942: \$? = $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 +20176,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18953 "configure"
-+#line 20179 "configure"
- #include "confdefs.h"
- 
--#line 18956 "configure"
-+#line 20182 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -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:20197: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18974: \$? = $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:20203: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18980: \$? = $ac_status" >&5
-+  echo "$as_me:20206: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  cf_ldflags_static=yes
-+
-+	# some linkers simply ignore the -dynamic
-+	case x`file conftest$ac_exeext 2>/dev/null` in #(vi
-+	*static*) # (vi
-+		cf_ldflags_static=no
-+		;;
-+	*)
-+		cf_ldflags_static=yes
-+		;;
-+	esac
-+
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-@@ -18990,7 +20226,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:18993: 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 +20242,12 @@
- 	;;
- esac
- 
--echo "$as_me:19009: 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 && \
- test "x$includedir" = 'x${prefix}/include' && \
- 	includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
--echo "$as_me:19014: 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 +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: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 +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: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 +20286,7 @@
- 	TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
- fi
- 
-+PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}"
- cf_cv_src_modules=
- for cf_dir in $modules_to_build
- do
-@@ -19096,10 +20333,11 @@
- 				TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
- 				TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2"
- 			fi
-+			PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}"
- 		fi
- 	fi
- done
--echo "$as_me:19102: 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 +20356,16 @@
- 	SRC_SUBDIRS="$SRC_SUBDIRS test"
- fi
- test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
--test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
-+if test "$cf_with_cxx_binding" != no; then
-+	PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}"
-+	SRC_SUBDIRS="$SRC_SUBDIRS c++"
-+fi
-+
-+test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_ARG_SUFFIX"
-+test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX"
- 
- ADA_SUBDIRS=
--if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
-+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then
- 	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
- 	ADA_SUBDIRS="gen src"
- 	if test "x$cf_with_tests" != "xno" ; then
-@@ -19143,7 +20387,7 @@
- 
- fi
- 
--if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
-+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
-    SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
-    SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in"
- fi
-@@ -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: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 +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:20569: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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:20581: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:19340: result: no" >&5
-+  echo "$as_me:20584: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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:20592: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -19359,11 +20603,6 @@
- ADAHTML_DIR=../../doc/html/ada
- 
- SUB_SCRIPTS=
--case $cf_cv_system_name in #(vi
--*mingw32*) #(vi
--	SUB_SCRIPTS="mk-dlls.sh"
--	;;
--esac
- 
- 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 +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:20688: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -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: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 +20880,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:19644: 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;}
-@@ -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"
- LIB_NAME="$LIB_NAME"
-+LIB_PREFIX="$LIB_PREFIX"
- LIB_SUBSETS="$LIB_SUBSETS"
- LIB_SUFFIX="$LIB_SUFFIX"
- LIB_TRACING="$LIB_TRACING"
-@@ -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
- cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
-+cf_cv_prog_gnat_correct=$cf_cv_prog_gnat_correct
- cf_cv_rel_version="$cf_cv_rel_version"
- cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
- cf_cv_shared_soname='$cf_cv_shared_soname'
- cf_cv_shlib_version="$cf_cv_shlib_version"
- cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
- cf_cv_system_name="$cf_cv_system_name"
-+cf_cv_term_driver="$with_term_driver"
- cf_with_ada="$cf_with_ada"
- cf_with_cxx_binding="$cf_with_cxx_binding"
- cf_with_manpages="$cf_with_manpages"
-@@ -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:20992: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -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
- s,@INSTALL_LIB@,$INSTALL_LIB,;t t
-+s,@RPATH_LIST@,$RPATH_LIST,;t t
- s,@cf_ldd_prog@,$cf_ldd_prog,;t t
- s,@TERMINFO_SRC@,$TERMINFO_SRC,;t t
- s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t
- s,@WHICH_XTERM@,$WHICH_XTERM,;t t
-+s,@XTERM_KBS@,$XTERM_KBS,;t t
- s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
- s,@TERMINFO@,$TERMINFO,;t t
- s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t
-@@ -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
- s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t
--s,@TICS_ARGS@,$TICS_ARGS,;t t
-+s,@TICS_LDFLAGS@,$TICS_LDFLAGS,;t t
-+s,@TICS_LIBS@,$TICS_LIBS,;t t
- s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t
- s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t
- s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t
--s,@TINFO_ARGS@,$TINFO_ARGS,;t t
--s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
-+s,@TINFO_LDFLAGS@,$TINFO_LDFLAGS,;t t
-+s,@TINFO_LIBS@,$TINFO_LIBS,;t t
-+s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t
- s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t
- s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t
- s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
-@@ -20032,6 +21285,7 @@
- s,@TEST_DEPS@,$TEST_DEPS,;t t
- s,@TEST_ARG2@,$TEST_ARG2,;t t
- s,@TEST_DEP2@,$TEST_DEP2,;t t
-+s,@PC_MODULES_TO_MAKE@,$PC_MODULES_TO_MAKE,;t t
- s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t
- s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t
- s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t
-@@ -20157,7 +21411,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:20160: 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 +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: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 +21442,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:20191: 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 +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: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 +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: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 +21532,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:20281: 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 +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:21593: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -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
- 
--	case $cf_cv_system_name in #(vi
--	OS/2*|os2*) #(vi
--        LIB_PREFIX=''
--        ;;
--	*)	LIB_PREFIX='lib'
--        ;;
--	esac
- cf_prefix=$LIB_PREFIX
- 
--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
- 		case $cf_cv_system_name in
--		aix[56]*) #(vi
-+		aix[5-7]*) #(vi
- 			cf_suffix='.a'
- 			cf_depsuf=$cf_suffix
- 			;;
--		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
- 		case $cf_cv_system_name in
--		aix[56]*) #(vi
-+		aix[5-7]*) #(vi
- 			cf_suffix='.a'
- 			cf_depsuf=$cf_suffix
- 			;;
--		cygwin*) #(vi
-+		cygwin*|mingw*) #(vi
- 			cf_suffix='.dll'
- 			cf_depsuf='.dll.a'
- 			;;
-@@ -20743,6 +21999,7 @@
- 				prefix=$cf_prefix \
- 				suffix=$cf_suffix \
- 				subset=$cf_subset \
-+				driver=$cf_cv_term_driver \
- 				SymLink="$LN_S" \
- 				TermlibRoot=$TINFO_NAME \
- 				TermlibSuffix=$TINFO_SUFFIX \
-@@ -20979,7 +22236,7 @@
- 	fi
- done
- 
--if test "x$cf_with_ada" != xno ; then
-+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
- if test -z "$USE_OLD_MAKERULES" ; then
- 	$AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
- fi
-diff -Naur ncurses-5.9.orig/configure.in ncurses-5.9/configure.in
---- 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***************************************************************************
--dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.520 2011/03/28 00:22:26 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
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.13.20020210)
--AC_REVISION($Revision: 1.520 $)
-+AC_REVISION($Revision: 1.552 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -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.
- CF_PKG_CONFIG
--
--if test "$PKG_CONFIG" != no ; then
--	AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
--
--	# Leave this as something that can be overridden in the environment.
--	if test -z "$PKG_CONFIG_LIBDIR" ; then
--		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
--	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
--		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)
--	else
--		AC_MSG_RESULT(no)
--		AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
--		enable_pc_files=no
--	fi
--fi
--AC_SUBST(PKG_CONFIG_LIBDIR)
-+CF_WITH_PKG_CONFIG_LIBDIR
-+CF_ENABLE_PC_FILES
- 
- AC_MSG_CHECKING(if we should assume mixed-case filenames)
- AC_ARG_ENABLE(mixed-case,
-@@ -321,9 +310,7 @@
- LIB_DIR=../lib
- LIB_2ND=../../lib
- 
--CF_LIB_PREFIX(cf_prefix)
--LIB_PREFIX=$cf_prefix
--AC_SUBST(LIB_PREFIX)
-+CF_WITH_LIB_PREFIX(cf_prefix)
- 
- LIB_SUFFIX=
- AC_SUBST(LIB_SUFFIX)
-@@ -453,7 +440,6 @@
- esac
- AC_SUBST(TERMINFO_SRC)
- 
--CF_PATHSEP
- if test "$use_database" != no ; then
- 	AC_DEFINE(USE_DATABASE)
- 
-@@ -494,6 +480,26 @@
- WHICH_XTERM=$with_xterm_new
- AC_SUBST(WHICH_XTERM)
- 
-+AC_MSG_CHECKING(if xterm backspace sends BS or DEL)
-+AC_ARG_WITH(xterm-kbs,
-+	[  --with-xterm-kbs=XXX     specify if xterm backspace sends BS or DEL],
-+	[with_xterm_kbs=$withval],
-+	[with_xterm_kbs=BS])
-+case x$with_xterm_kbs in
-+xyes|xno|xBS|xbs|x8)
-+	with_xterm_kbs=BS
-+	;;
-+xDEL|xdel|x127)
-+	with_xterm_kbs=DEL
-+	;;
-+*)
-+	with_xterm_kbs=$withval
-+	;;
-+esac
-+AC_MSG_RESULT($with_xterm_kbs)
-+XTERM_KBS=$with_xterm_kbs
-+AC_SUBST(XTERM_KBS)
-+
- MAKE_TERMINFO=
- if test "$use_database" = no ; then
- 	TERMINFO="${datadir}/terminfo"
-@@ -721,14 +727,9 @@
- if test "$with_widec" = yes ; then
- 	LIB_SUFFIX="w${LIB_SUFFIX}"
- 	AC_DEFINE(USE_WIDEC_SUPPORT)
-+	AC_DEFINE(NCURSES_WIDECHAR)
- 
--	case "$CFLAGS $CPPFLAGS" in #(vi
--	*-D_XOPEN_SOURCE=500) #(vi
--		;;
--	*)
--		CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
--		;;
--	esac
-+	CF_CHECK_WCHAR_H
- 
- 	# with_overwrite=no
- 	NCURSES_CH_T=cchar_t
-@@ -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
- 	NCURSES_EXT_FUNCS=1
-+	AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS)
- 	AC_DEFINE(HAVE_CURSES_VERSION)
- 	AC_DEFINE(HAVE_HAS_KEY)
- 	AC_DEFINE(HAVE_RESIZETERM)
- 	AC_DEFINE(HAVE_RESIZE_TERM)
- 	AC_DEFINE(HAVE_TERM_ENTRY_H)
- 	AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
-+	AC_DEFINE(HAVE_USE_SCREEN)
-+	AC_DEFINE(HAVE_USE_WINDOW)
- 	AC_DEFINE(HAVE_WRESIZE)
- 	AC_DEFINE(NCURSES_EXT_FUNCS)
- 	GENERATED_EXT_FUNCS=generated
-@@ -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 \
- )
- 
-+CF_GETOPT_HEADER
-+
- # check for ISC (this may also define _POSIX_SOURCE)
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "$ISC" = yes ; then
-@@ -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
- AC_TYPE_SIGNAL
-+AC_CHECK_TYPE(intptr_t, long)
- CF_TYPE_SIGACTION
- CF_SIZECHANGE
- CF_FUNC_MEMMOVE
-@@ -1478,50 +1491,14 @@
- 		;;
- 	esac
- 
--	AC_CHECK_HEADERS(iostream typeinfo)
--
--    if test x"$ac_cv_header_iostream" = xyes ; then
--        AC_MSG_CHECKING(if iostream uses std-namespace)
--        AC_TRY_COMPILE([
--#include <iostream>
--using std::endl;
--using std::cerr;],[
--cerr << "testing" << endl;
--],[cf_iostream_namespace=yes],[cf_iostream_namespace=no])
--        AC_MSG_RESULT($cf_iostream_namespace)
--        if test "$cf_iostream_namespace" = yes ; then
--            AC_DEFINE(IOSTREAM_NAMESPACE)
--        fi
--    fi
--
-+	AC_CHECK_HEADERS(typeinfo)
-+	CF_CXX_IOSTREAM_NAMESPACE
- 	CF_BOOL_DECL
- 	CF_BOOL_SIZE
- 	CF_ETIP_DEFINES
- 	CF_CPP_PARAM_INIT
- 	CF_CPP_STATIC_CAST
--
--	CXX_AR='$(AR)'
--	CXX_ARFLAGS='$(ARFLAGS)'
--	case $cf_cv_system_name in #(vi
--	irix*) #(vi
--	    if test "$GXX" != yes ; then
--		CXX_AR='$(CXX)'
--		CXX_ARFLAGS='-ar -o'
--	    fi
--	    ;;
--	sco3.2v5*) #(vi
--	    CXXLDFLAGS="-u main"
--	    ;;
--	solaris2*)
--	    if test "$GXX" != yes ; then
--		CXX_AR='$(CXX)'
--		CXX_ARFLAGS='-xar -o'
--	    fi
--	    ;;
--	esac
--	AC_SUBST(CXXLDFLAGS)
--	AC_SUBST(CXX_AR)
--	AC_SUBST(CXX_ARFLAGS)
-+	CF_CXX_AR_FLAGS
- else
- 	cf_cxx_library=no
- 	cf_cv_builtin_bool=1
-@@ -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}"
- 	fi
--	TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
-+	TICS_LDFLAGS="-L${LIB_DIR}"
-+	TICS_LIBS="-l${TICS_LIB_SUFFIX}"
- else
--	TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+	TICS_LDFLAGS="-L${LIB_DIR}"
-+	TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
- fi
- AC_SUBST(TICS_ARG_SUFFIX)
- AC_SUBST(TICS_DEP_SUFFIX)
- AC_SUBST(TICS_LIB_SUFFIX)
--AC_SUBST(TICS_ARGS)
-+AC_SUBST(TICS_LDFLAGS)
-+AC_SUBST(TICS_LIBS)
- 
- if test "$with_termlib" != no ; then
- 
-@@ -1768,14 +1737,22 @@
- 	if test "$DFT_LWR_MODEL" = "libtool"; then
- 		TEST_ARGS="${TEST_DEPS}"
- 		TEST_ARG2="${TEST_DEP2}"
--		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+		TINFO_LDFLAGS="-L${LIB_DIR}"
-+		TINFO_LIBS="$TEST_ARGS"
- 		TICS_LIST="$SHLIB_LIST $TEST_ARGS"
- 		SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
- 	else
- 		TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
- 		TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
--		TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
--		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+		if test "x$with_term_driver" != xno ; then
-+			TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+			TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+			TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+		else
-+			TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
-+			TINFO_LIBS="$TEST_ARGS"
-+		fi
-+		TINFO_LDFLAGS="-L${LIB_DIR}"
- 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- 	fi
- else
-@@ -1789,7 +1766,8 @@
- 		TICS_LIST="$SHLIB_LIST"
- 	fi
- 
--	TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+	TINFO_LDFLAGS="-L${LIB_DIR}"
-+	TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
- fi
- 
- if test "$DFT_LWR_MODEL" = shared ; then
-@@ -1804,7 +1782,8 @@
- AC_SUBST(TINFO_ARG_SUFFIX)
- AC_SUBST(TINFO_DEP_SUFFIX)
- AC_SUBST(TINFO_LIB_SUFFIX)
--AC_SUBST(TINFO_ARGS)
-+AC_SUBST(TINFO_LDFLAGS)
-+AC_SUBST(TINFO_LIBS)
- 
- if test "$with_dlsym" = yes ; then
- 	CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
-@@ -1815,8 +1794,8 @@
- fi
- 
- # needed for Ada95
--TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
--AC_SUBST(TINFO_ARGS2)
-+TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
-+AC_SUBST(TINFO_LDFLAGS2)
- 
- case $DFT_LWR_MODEL in
- normal|debug|profile)
-@@ -1857,7 +1836,7 @@
- 
- CF_SRC_MODULES($modules_to_build)
- 
--if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
-+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
-    SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
-    SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in"
- fi
-@@ -1918,11 +1897,6 @@
- AC_SUBST(ADAHTML_DIR)
- 
- SUB_SCRIPTS=
--case $cf_cv_system_name in #(vi
--*mingw32*) #(vi
--	SUB_SCRIPTS="mk-dlls.sh"
--	;;
--esac
- 
- AC_OUTPUT( \
- 	include/MKterm.h.awk \
-@@ -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)
- 
--if test "x$cf_with_ada" != xno ; then
-+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
- if test -z "$USE_OLD_MAKERULES" ; then
- 	$AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
- fi
-@@ -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"
- LIB_NAME="$LIB_NAME"
-+LIB_PREFIX="$LIB_PREFIX"
- LIB_SUBSETS="$LIB_SUBSETS"
- LIB_SUFFIX="$LIB_SUFFIX"
- LIB_TRACING="$LIB_TRACING"
-@@ -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
- cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
-+cf_cv_prog_gnat_correct=$cf_cv_prog_gnat_correct
- cf_cv_rel_version="$cf_cv_rel_version"
- cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
- cf_cv_shared_soname='$cf_cv_shared_soname'
- cf_cv_shlib_version="$cf_cv_shlib_version"
- cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
- cf_cv_system_name="$cf_cv_system_name"
-+cf_cv_term_driver="$with_term_driver"
- cf_with_ada="$cf_with_ada"
- cf_with_cxx_binding="$cf_with_cxx_binding"
- 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-08-25 19:57:59.409900901 +0000
-+++ ncurses-5.9/dist.mk	2012-08-25 19:58:02.359886951 +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"), #
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.810 2011/04/04 22:42:20 tom Exp $
-+# $Id: dist.mk,v 1.886 2012/08/11 15:55:23 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 5
- NCURSES_MINOR = 9
--NCURSES_PATCH = 20110404
-+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-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>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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>
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- </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-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>
-        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_termcap.3x,v 1.26 2010/12/04 18:38:55 tom Exp @
-+  * @Id: curs_termcap.3x,v 1.27 2011/10/15 21:11:24 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -79,39 +79,57 @@
-        bilities  of  entries  for which a terminfo entry has been
-        compiled.
- 
--       The <STRONG>tgetent</STRONG> routine loads the entry for <EM>name</EM>.  It  returns
--       1  on  success, 0 if there is no such entry, and -1 if the
--       terminfo database could not be found.  The  emulation  ig-
--       nores the buffer pointer <EM>bp</EM>.
-+       The <STRONG>tgetent</STRONG> routine loads the entry for <EM>name</EM>.  It returns:
-+
-+          1  on success,
-+
-+          0  if  there  is no such entry (or that it is a generic
-+             type, having too little information for  curses  ap-
-+             plications to run), and
-+
-+          -1 if the terminfo database could not be found.
-+
-+       This differs from the <EM>termcap</EM> library in two ways:
-+
-+          -  The  emulation  ignores  the buffer pointer <EM>bp</EM>.  The
-+             <EM>termcap</EM> library would store a copy of  the  terminal
-+             description  in the area referenced by this pointer.
-+             However, ncurses stores its terminal descriptions in
-+             compiled binary form, which is not the same thing.
-+
-+          -  There  is a difference in return codes.  The <EM>termcap</EM>
-+             library does not check if the  terminal  description
-+             is  marked  with  the  <EM>generic</EM> capability, or if the
-+             terminal description has cursor-addressing.
- 
-        The <STRONG>tgetflag</STRONG> routine gets the boolean entry for <EM>id</EM>, or ze-
-        ro if it is not available.
- 
--       The <STRONG>tgetnum</STRONG> routine gets the numeric entry for <EM>id</EM>,  or  -1
-+       The  <STRONG>tgetnum</STRONG>  routine gets the numeric entry for <EM>id</EM>, or -1
-        if it is not available.
- 
--       The  <STRONG>tgetstr</STRONG>  routine  returns the string entry for <EM>id</EM>, or
--       zero if it is not available.  Use <STRONG>tputs</STRONG> to output the  re-
--       turned  string.   The  return value will also be copied to
--       the buffer pointed to by <EM>area</EM>, and the <EM>area</EM> value will  be
-+       The <STRONG>tgetstr</STRONG> routine returns the string entry  for  <EM>id</EM>,  or
-+       zero  if it is not available.  Use <STRONG>tputs</STRONG> to output the re-
-+       turned string.  The return value will also  be  copied  to
-+       the  buffer pointed to by <EM>area</EM>, and the <EM>area</EM> value will be
-        updated to point past the null ending this value.
- 
-        Only the first two characters of the <STRONG>id</STRONG> parameter of <STRONG>tget-</STRONG>
-        <STRONG>flag</STRONG>, <STRONG>tgetnum</STRONG> and <STRONG>tgetstr</STRONG> are compared in lookups.
- 
--       The <STRONG>tgoto</STRONG> routine instantiates  the  parameters  into  the
--       given  capability.   The output from this routine is to be
-+       The  <STRONG>tgoto</STRONG>  routine  instantiates  the parameters into the
-+       given capability.  The output from this routine is  to  be
-        passed to <STRONG>tputs</STRONG>.
- 
--       The <STRONG>tputs</STRONG> routine is described  on  the  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
-+       The  <STRONG>tputs</STRONG>  routine  is described on the <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
-        manual page.  It can retrieve capabilities by either term-
-        cap or terminfo name.
- 
-        The variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the ter-
-        minfo   entry's   data   for   <STRONG>pad_char</STRONG>,   <STRONG>cursor_up</STRONG>   and
--       <STRONG>backspace_if_not_bs</STRONG>, respectively.   <STRONG>UP</STRONG>  is  not  used  by
-+       <STRONG>backspace_if_not_bs</STRONG>,  respectively.   <STRONG>UP</STRONG>  is  not  used by
-        ncurses.  <STRONG>PC</STRONG> is used in the <STRONG>tdelay_output</STRONG> function.  <STRONG>BC</STRONG> is
--       used in the <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG>  is  set
-+       used  in  the <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG> is set
-        by ncurses in a system-specific coding to reflect the ter-
-        minal speed.
- 
-@@ -119,7 +137,7 @@
- </PRE>
- <H2>RETURN VALUE</H2><PRE>
-        Except where explicitly noted, routines that return an in-
--       teger  return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 only specifies
-+       teger return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 only  specifies
-        "an integer value other than <STRONG>ERR</STRONG>") upon successful comple-
-        tion.
- 
-@@ -129,48 +147,48 @@
- </PRE>
- <H2>BUGS</H2><PRE>
-        If you call <STRONG>tgetstr</STRONG> to fetch <STRONG>ca</STRONG> or any other parameterized
--       string, be aware that it will be returned in terminfo  no-
-+       string,  be aware that it will be returned in terminfo no-
-        tation, not the older and not-quite-compatible termcap no-
--       tation.  This will not cause problems if all you  do  with
--       it  is  call  <STRONG>tgoto</STRONG>  or <STRONG>tparm</STRONG>, which both expand terminfo-
--       style strings as terminfo.  (The <STRONG>tgoto</STRONG> function,  if  con-
--       figured  to  support  termcap, will check if the string is
--       indeed terminfo-style by looking for  "%p"  parameters  or
--       "$&lt;..&gt;"  delays,  and invoke a termcap-style parser if the
-+       tation.   This  will not cause problems if all you do with
-+       it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>,  which  both  expand  terminfo-
-+       style  strings  as terminfo.  (The <STRONG>tgoto</STRONG> function, if con-
-+       figured to support termcap, will check if  the  string  is
-+       indeed  terminfo-style  by  looking for "%p" parameters or
-+       "$&lt;..&gt;" delays, and invoke a termcap-style parser  if  the
-        string does not appear to be terminfo).
- 
--       Because terminfo conventions for representing  padding  in
--       string  capabilities  differ  from termcap's, <STRONG>tputs("50");</STRONG>
--       will put out a literal "50" rather than  busy-waiting  for
-+       Because  terminfo  conventions for representing padding in
-+       string capabilities differ  from  termcap's,  <STRONG>tputs("50");</STRONG>
-+       will  put  out a literal "50" rather than busy-waiting for
-        50 milliseconds.  Cope with it.
- 
--       Note  that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG>
--       string.  One consequence of this is that termcap  applica-
--       tions  assume me (terminfo <STRONG>sgr0</STRONG>) does not reset the alter-
--       nate character set.  This implementation checks  for,  and
-+       Note that termcap has nothing analogous to terminfo's  <STRONG>sgr</STRONG>
-+       string.   One consequence of this is that termcap applica-
-+       tions assume me (terminfo <STRONG>sgr0</STRONG>) does not reset the  alter-
-+       nate  character  set.  This implementation checks for, and
-        modifies the data shown to the termcap interface to accom-
-        modate termcap's limitation in this respect.
- 
- 
- </PRE>
- <H2>PORTABILITY</H2><PRE>
--       The XSI Curses standard, Issue  4  describes  these  func-
--       tions.   However,  they are marked TO BE WITHDRAWN and may
-+       The  XSI  Curses  standard,  Issue 4 describes these func-
-+       tions.  However, they are marked TO BE WITHDRAWN  and  may
-        be removed in future versions.
- 
--       Neither the XSI Curses standard nor  the  SVr4  man  pages
--       documented  the return values of <STRONG>tgetent</STRONG> correctly, though
--       all three were in fact returned ever since SVr1.  In  par-
--       ticular,  an  omission in the XSI Curses documentation has
--       been misinterpreted to mean that  <STRONG>tgetent</STRONG>  returns  <STRONG>OK</STRONG>  or
-+       Neither  the  XSI  Curses  standard nor the SVr4 man pages
-+       documented the return values of <STRONG>tgetent</STRONG> correctly,  though
-+       all  three were in fact returned ever since SVr1.  In par-
-+       ticular, an omission in the XSI Curses  documentation  has
-+       been  misinterpreted  to  mean  that <STRONG>tgetent</STRONG> returns <STRONG>OK</STRONG> or
-        <STRONG>ERR</STRONG>.  Because the purpose of these functions is to provide
--       compatibility with the <EM>termcap</EM> library, that is  a  defect
-+       compatibility  with  the <EM>termcap</EM> library, that is a defect
-        in XCurses, Issue 4, Version 2 rather than in ncurses.
- 
--       External  variables  are  provided  for support of certain
--       termcap applications.  However, termcap applications'  use
-+       External variables are provided  for  support  of  certain
-+       termcap  applications.  However, termcap applications' use
-        of those variables is poorly documented, e.g., not distin-
--       guishing between input and output.   In  particular,  some
-+       guishing  between  input  and output.  In particular, some
-        applications are reported to declare and/or modify <STRONG>ospeed</STRONG>.
- 
- 
-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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1999-2008,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1999-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_terminfo.3x,v 1.35 2010/12/04 18:38:55 tom Exp @
-+  * @Id: curs_terminfo.3x,v 1.36 2011/12/17 23:31:40 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -258,11 +258,11 @@
- 
-        Routines that return pointers always return <STRONG>NULL</STRONG> on error.
- 
--       X/Open defines no error conditions.  In  this  implementa-
-+       X/Open  defines  no error conditions.  In this implementa-
-        tion
- 
-               <STRONG>del_curterm</STRONG>
--                   returns  an error if its terminal parameter is
-+                   returns an error if its terminal parameter  is
-                    null.
- 
-               <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error-codes.
-@@ -272,23 +272,23 @@
-                    <STRONG>tupterm</STRONG> returns an error.
- 
-               <STRONG>setupterm</STRONG>
--                   returns  an error if it cannot allocate enough
-+                   returns an error if it cannot allocate  enough
-                    memory, or create the initial windows (stdscr,
--                   curscr,  newscr).   Other error conditions are
-+                   curscr, newscr).  Other error  conditions  are
-                    documented above.
- 
-               <STRONG>tputs</STRONG>
--                   returns an error if the  string  parameter  is
--                   null.   It  does not detect I/O errors: X/Open
--                   states that <STRONG>tputs</STRONG> ignores the return value  of
-+                   returns  an  error  if the string parameter is
-+                   null.  It does not detect I/O  errors:  X/Open
-+                   states  that <STRONG>tputs</STRONG> ignores the return value of
-                    the output function <EM>putc</EM>.
- 
- 
- </PRE>
- <H2>NOTES</H2><PRE>
--       The  <STRONG>setupterm</STRONG> routine should be used in place of <STRONG>setterm</STRONG>.
--       It may be useful when you want to test for terminal  capa-
--       bilities  without  committing to the allocation of storage
-+       The <STRONG>setupterm</STRONG> routine should be used in place of  <STRONG>setterm</STRONG>.
-+       It  may be useful when you want to test for terminal capa-
-+       bilities without committing to the allocation  of  storage
-        involved in <STRONG>initscr</STRONG>.
- 
-        Note that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros.
-@@ -296,58 +296,58 @@
- 
- </PRE>
- <H2>PORTABILITY</H2><PRE>
--       The function <STRONG>setterm</STRONG> is not described by X/Open  and  must
--       be  considered  non-portable.   All other functions are as
-+       The  function  <STRONG>setterm</STRONG> is not described by X/Open and must
-+       be considered non-portable.  All other  functions  are  as
-        described by X/Open.
- 
--       <STRONG>setupterm</STRONG> copies the terminal name to the  array  <STRONG>ttytype</STRONG>.
--       This  is not part of X/Open Curses, but is assumed by some
-+       <STRONG>setupterm</STRONG>  copies  the terminal name to the array <STRONG>ttytype</STRONG>.
-+       This is not part of X/Open Curses, but is assumed by  some
-        applications.
- 
--       In System V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return  type
--       and  returns  <STRONG>OK</STRONG>  or <STRONG>ERR</STRONG>.  We have chosen to implement the
-+       In  System V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type
-+       and returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen  to  implement  the
-        X/Open Curses semantics.
- 
-        In System V Release 4, the third argument of <STRONG>tputs</STRONG> has the
-        type <STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>.
- 
-        At least one implementation of X/Open Curses (Solaris) re-
--       turns a value other than OK/ERR from <STRONG>tputs</STRONG>.  That  returns
-+       turns  a value other than OK/ERR from <STRONG>tputs</STRONG>.  That returns
-        the length of the string, and does no error-checking.
- 
--       X/Open  Curses prototypes <STRONG>tparm</STRONG> with a fixed number of pa-
--       rameters, rather than a variable argument list.  This  im-
--       plementation  uses  a  variable  argument list, but can be
--       configured to use the fixed-parameter list.  Portable  ap-
--       plications  should  provide 9 parameters after the format;
-+       X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number of  pa-
-+       rameters,  rather than a variable argument list.  This im-
-+       plementation uses a variable argument  list,  but  can  be
-+       configured  to use the fixed-parameter list.  Portable ap-
-+       plications should provide 9 parameters after  the  format;
-        zeroes are fine for this purpose.
- 
-        In response to comments by Thomas E. Dickey, X/Open Curses
-        Issue 7 proposed the <STRONG>tiparam</STRONG> function in mid-2009.
- 
--       X/Open  notes  that  after calling <STRONG>mvcur</STRONG>, the curses state
--       may not match the actual terminal state, and that  an  ap-
--       plication  should  touch and refresh the window before re-
-+       X/Open notes that after calling <STRONG>mvcur</STRONG>,  the  curses  state
-+       may  not  match the actual terminal state, and that an ap-
-+       plication should touch and refresh the window  before  re-
-        suming normal curses calls.  Both ncurses and System V Re-
-        lease 4 curses implement <STRONG>mvcur</STRONG> using the SCREEN data allo-
-        cated in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is docu-
--       mented  as  a  terminfo function, <STRONG>mvcur</STRONG> is really a curses
-+       mented as a terminfo function, <STRONG>mvcur</STRONG> is  really  a  curses
-        function which is not well specified.
- 
--       X/Open states that the old  location  must  be  given  for
--       <STRONG>mvcur</STRONG>.   This implementation allows the caller to use -1's
--       for the old ordinates.  In that case, the old location  is
-+       X/Open  states  that  the  old  location must be given for
-+       <STRONG>mvcur</STRONG>.  This implementation allows the caller to use  -1's
-+       for  the old ordinates.  In that case, the old location is
-        unknown.
- 
--       Extended  terminal  capability  names, e.g., as defined by
--       <STRONG>tic</STRONG> <STRONG>-x</STRONG>, are not stored in the  arrays  described  in  this
-+       Extended terminal capability names, e.g.,  as  defined  by
-+       <STRONG>tic</STRONG> <STRONG>-x</STRONG>,  are  not  stored  in the arrays described in this
-        section.
- 
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG>curs_term-</STRONG>
--       <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,  <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>,
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,  <STRONG>curs_term-</STRONG>
-+       <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>,
-        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
- 
-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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * 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 @
- -->
- <HTML>
- <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-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 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @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 @
- -->
- <HTML>
- <HEAD>
-@@ -53,7 +53,7 @@
- 
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
--       <STRONG>infocmp</STRONG> [<STRONG>-1CEFGILTUVcdegilnpqrtux</STRONG>]
-+       <STRONG>infocmp</STRONG> [<STRONG>-1CDEFGIKLTUVcdegilnpqrtux</STRONG>]
-              [<STRONG>-v</STRONG> <EM>n</EM>] [<STRONG>-s</STRONG> <STRONG>d</STRONG>| <STRONG>i</STRONG>| <STRONG>l</STRONG>| <STRONG>c</STRONG>] [<STRONG>-R</STRONG> <STRONG>subset</STRONG>]
-              [<STRONG>-w</STRONG> <EM>width</EM>] [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>]
-              [<EM>termname</EM>...]
-@@ -107,6 +107,7 @@
-       <STRONG>-L</STRONG>   use the long C variable name listed in &lt;<STRONG>term.h</STRONG>&gt;
-       <STRONG>-C</STRONG>   use the <STRONG>termcap</STRONG> names
-       <STRONG>-r</STRONG>   when using <STRONG>-C</STRONG>, put out all capabilities in <STRONG>termcap</STRONG> form
-+      <STRONG>-K</STRONG>   modifies the <STRONG>-C</STRONG> option, improving BSD-compatibility.
- 
-        If  no  <EM>termnames</EM> are given, the environment variable <STRONG>TERM</STRONG>
-        will be used for the terminal name.
-@@ -129,7 +130,11 @@
-        only  those variables which were part of <STRONG>termcap</STRONG> will nor-
-        mally be output.  Specifying the <STRONG>-r</STRONG> option will  take  off
-        this  restriction,  allowing all capabilities to be output
--       in <EM>termcap</EM> form.
-+       in <EM>termcap</EM> form.  Normally you would use both the  <STRONG>-C</STRONG>  and
-+       <STRONG>-r</STRONG>  options.   The  actual  format  used incorporates some
-+       improvements for escaped characters from terminfo  format.
-+       For  a  stricter  BSD-compatible  translation,  use the <STRONG>-K</STRONG>
-+       option rather than <STRONG>-C</STRONG>.
- 
-        Note that because padding is collected to the beginning of
-        the  capability,  not all capabilities are output.  Manda-
-@@ -173,9 +178,9 @@
-        <EM>termname</EM>  entries contains a value for it.  A capability's
-        value gets printed if the value in the first  <EM>termname</EM>  is
-        not  found in any of the other <EM>termname</EM> entries, or if the
--       first of the other <EM>termname</EM> entries that has this capabil-
--       ity  gives  a different value for the capability than that
--       in the first <EM>termname</EM>.
-+       first  of  the  other  <EM>termname</EM>  entries  that  has   this
-+       capability gives a different value for the capability than
-+       that in the first <EM>termname</EM>.
- 
-        The order of the other <EM>termname</EM>  entries  is  significant.
-        Since  the terminfo compiler <STRONG>tic</STRONG> does a left-to-right scan
-@@ -214,14 +219,20 @@
-        different people.
- 
-    <STRONG>Other</STRONG> <STRONG>Options</STRONG>
--       <STRONG>-1</STRONG>   causes  the  fields  to be printed out one to a line.
--            Otherwise, the fields will be printed  several  to  a
-+       <STRONG>-0</STRONG>   causes  the fields to be printed on one line, without
-+            wrapping.
-+
-+       <STRONG>-1</STRONG>   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 of 60 characters.
- 
--       <STRONG>-a</STRONG>   tells  <STRONG>infocmp</STRONG>  to  retain commented-out capabilities
--            rather than discarding them.  Capabilities  are  com-
-+       <STRONG>-a</STRONG>   tells <STRONG>infocmp</STRONG> to  retain  commented-out  capabilities
-+            rather  than  discarding them.  Capabilities are com-
-             mented by prefixing them with a period.
- 
-+       <STRONG>-D</STRONG>   tells <STRONG>infocmp</STRONG> to print the database locations that it
-+            knows about, and exit.
-+
-        <STRONG>-E</STRONG>   Dump  the  capabilities  of  the  given  terminal  as
-             tables, needed in the C initializer  for  a  TERMTYPE
-             structure  (the  terminal capability structure in the
-@@ -233,8 +244,8 @@
- 
-             Before ncurses 5.0, the split between the <STRONG>-e</STRONG>  and  <STRONG>-E</STRONG>
-             options  was  not  needed;  but  support for extended
--            names required making the arrays of terminal capabil-
--            ities separate from the TERMTYPE structure.
-+            names  required  making  the   arrays   of   terminal
-+            capabilities separate from the TERMTYPE structure.
- 
-        <STRONG>-e</STRONG>   Dump  the  capabilities  of the given terminal as a C
-             initializer for a TERMTYPE  structure  (the  terminal
-@@ -299,6 +310,7 @@
-                   ISO US G1     enable US chars for G1
-                   -----------------------------------------
-                   DECPAM        application keypad mode
-+
-                   DECPNM        normal keypad mode
-                   DECANSI       enter ANSI mode
-                   -----------------------------------------
-@@ -310,7 +322,6 @@
-                   DEC[+-]CKM    application cursor keys
-                   DEC[+-]ANM    set VT52 mode
-                   DEC[+-]COLM   132-column mode
--
-                   DEC[+-]SCLM   smooth scroll
-                   DEC[+-]SCNM   reverse video mode
-                   DEC[+-]OM     origin mode
-@@ -404,12 +415,13 @@
- 
- </PRE>
- <H2>EXTENSIONS</H2><PRE>
--       The <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG>
--       and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
-+       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>,  <STRONG>-f</STRONG>,  <STRONG>-g</STRONG>,  <STRONG>-i</STRONG>,
-+       <STRONG>-l</STRONG>,  <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>  and  <STRONG>-t</STRONG>  options  are  not supported in SVr4
-+       curses.
- 
-        The <STRONG>-r</STRONG> 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 4.4BSD set, use <STRONG>-r</STRONG>
-+       V  Release  4's.   Actual  BSD curses versions will have a
-+       more restricted set.  To see only the 4.4BSD set,  use  <STRONG>-r</STRONG>
-        <STRONG>-RBSD</STRONG>.
- 
- 
-@@ -420,10 +432,10 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,     <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,     <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-+       <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,     <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- </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-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>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- </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-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 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @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 @
- -->
- <HTML>
- <HEAD>
-@@ -63,7 +63,7 @@
-        sonable   optimization.    This  implementation  is  ``new
-        curses'' (ncurses) and is  the  approved  replacement  for
-        4.4BSD  classic curses, which has been discontinued.  This
--       describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
-        The <STRONG>ncurses</STRONG> library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-@@ -757,9 +757,12 @@
-        pletion, unless otherwise noted in  the  routine  descrip-
-        tions.
- 
--       All  macros  return  the  value  of  the <STRONG>w</STRONG> version, except
-+       As a general rule, routines check for null pointers passed
-+       as parameters, and handle this as an error.
-+
-+       All macros return the  value  of  the  <STRONG>w</STRONG>  version,  except
-        <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>, <STRONG>getbegyx</STRONG>, and <STRONG>getmaxyx</STRONG>.  The
--       return  values  of <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>, <STRONG>getbegyx</STRONG>,
-+       return values of <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>,  <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,
-        and <STRONG>getmaxyx</STRONG> are undefined (i.e., these should not be used
-        as the right-hand side of assignment statements).
- 
-@@ -773,46 +776,46 @@
-        important ones have been already discussed in detail.
- 
-        BAUDRATE
--            The  debugging library checks this environment symbol
-+            The debugging library checks this environment  symbol
-             when the application has redirected output to a file.
--            The  symbol's numeric value is used for the baudrate.
-+            The symbol's numeric value is used for the  baudrate.
-             If no value is found, <STRONG>ncurses</STRONG> uses 9600.  This allows
--            testers  to construct repeatable test-cases that take
-+            testers to construct repeatable test-cases that  take
-             into account costs that depend on baudrate.
- 
-        CC   When set, change occurrences of the command_character
--            (i.e.,  the  <STRONG>cmdch</STRONG> capability) of the loaded terminfo
--            entries to the value of this symbol.  Very  few  ter-
-+            (i.e., the <STRONG>cmdch</STRONG> capability) of the  loaded  terminfo
-+            entries  to  the value of this symbol.  Very few ter-
-             minfo entries provide this feature.
- 
--            Because  this  name is also used in development envi-
--            ronments to represent the C compiler's name,  <STRONG>ncurses</STRONG>
-+            Because this name is also used in  development  envi-
-+            ronments  to represent the C compiler's name, <STRONG>ncurses</STRONG>
-             ignores it if it does not happen to be a single char-
-             acter.
- 
-        COLUMNS
-             Specify  the  width  of  the  screen  in  characters.
--            Applications  running in a windowing environment usu-
--            ally are able to obtain the width of  the  window  in
--            which  they  are  executing.   If neither the <STRONG>COLUMNS</STRONG>
--            value nor the terminal's screen  size  is  available,
--            <STRONG>ncurses</STRONG>  uses  the size which may be specified in the
-+            Applications running in a windowing environment  usu-
-+            ally  are  able  to obtain the width of the window in
-+            which they are executing.   If  neither  the  <STRONG>COLUMNS</STRONG>
-+            value  nor  the  terminal's screen size is available,
-+            <STRONG>ncurses</STRONG> uses the size which may be specified  in  the
-             terminfo database (i.e., the <STRONG>cols</STRONG> capability).
- 
--            It is important that your application use  a  correct
--            size  for  the  screen.   This is not always possible
--            because your application may be  running  on  a  host
--            which  does not honor NAWS (Negotiations About Window
--            Size), or because  you  are  temporarily  running  as
--            another  user.  However, setting <STRONG>COLUMNS</STRONG> and/or <STRONG>LINES</STRONG>
-+            It  is  important that your application use a correct
-+            size for the screen.  This  is  not  always  possible
-+            because  your  application  may  be running on a host
-+            which does not honor NAWS (Negotiations About  Window
-+            Size),  or  because  you  are  temporarily running as
-+            another user.  However, setting <STRONG>COLUMNS</STRONG> and/or  <STRONG>LINES</STRONG>
-             overrides  the  library's  use  of  the  screen  size
-             obtained from the operating system.
- 
--            Either  <STRONG>COLUMNS</STRONG>  or  <STRONG>LINES</STRONG>  symbols  may be specified
--            independently.  This is mainly useful  to  circumvent
--            legacy  misfeatures  of  terminal descriptions, e.g.,
-+            Either <STRONG>COLUMNS</STRONG> or  <STRONG>LINES</STRONG>  symbols  may  be  specified
-+            independently.   This  is mainly useful to circumvent
-+            legacy misfeatures of  terminal  descriptions,  e.g.,
-             xterm which commonly specifies a 65 line screen.  For
--            best  results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified
-+            best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be  specified
-             in a terminal description for terminals which are run
-             as emulations.
- 
-@@ -821,35 +824,35 @@
-             the screen size.
- 
-        ESCDELAY
--            Specifies  the total time, in milliseconds, for which
--            ncurses will await  a  character  sequence,  e.g.,  a
--            function  key.  The default value, 1000 milliseconds,
-+            Specifies the total time, in milliseconds, for  which
-+            ncurses  will  await  a  character  sequence, e.g., a
-+            function key.  The default value, 1000  milliseconds,
-             is enough for most uses.  However, it is made a vari-
-             able to accommodate unusual applications.
- 
-             The most common instance where you may wish to change
--            this value is to work with slow hosts, e.g.,  running
--            on  a  network.   If  the host cannot read characters
--            rapidly enough, it will have the same  effect  as  if
--            the  terminal did not send characters rapidly enough.
-+            this  value is to work with slow hosts, e.g., running
-+            on a network.  If the  host  cannot  read  characters
-+            rapidly  enough,  it  will have the same effect as if
-+            the terminal did not send characters rapidly  enough.
-             The library will still see a timeout.
- 
--            Note that xterm mouse events are built up from  char-
--            acter  sequences  received  from  the xterm.  If your
-+            Note  that xterm mouse events are built up from char-
-+            acter sequences received from  the  xterm.   If  your
-             application makes heavy use of multiple-clicking, you
--            may  wish  to lengthen this default value because the
--            timeout applies to the composed multi-click event  as
-+            may wish to lengthen this default value  because  the
-+            timeout  applies to the composed multi-click event as
-             well as the individual clicks.
- 
--            In  addition to the environment variable, this imple-
--            mentation provides a global variable  with  the  same
-+            In addition to the environment variable, this  imple-
-+            mentation  provides  a  global variable with the same
-             name.  Portable applications should not rely upon the
--            presence of ESCDELAY in either form, but setting  the
--            environment  variable rather than the global variable
--            does not create problems when compiling  an  applica-
-+            presence  of ESCDELAY in either form, but setting the
-+            environment variable rather than the global  variable
-+            does  not  create problems when compiling an applica-
-             tion.
- 
--       HOME Tells  <STRONG>ncurses</STRONG> where your home directory is.  That is
-+       HOME Tells <STRONG>ncurses</STRONG> where your home directory is.  That  is
-             where  it  may  read  and  write  auxiliary  terminal
-             descriptions:
- 
-@@ -857,12 +860,12 @@
-             $HOME/.terminfo
- 
-        LINES
--            Like  COLUMNS,  specify  the  height of the screen in
--            characters.  See COLUMNS for a detailed  description.
-+            Like COLUMNS, specify the height  of  the  screen  in
-+            characters.   See COLUMNS for a detailed description.
- 
-        MOUSE_BUTTONS_123
-             This applies only to the OS/2 EMX port.  It specifies
--            the order of buttons on the mouse.   OS/2  numbers  a
-+            the  order  of  buttons on the mouse.  OS/2 numbers a
-             3-button mouse inconsistently from other platforms:
- 
-             1 = left
-@@ -870,109 +873,109 @@
-             3 = middle.
- 
-             This symbol lets you customize the mouse.  The symbol
--            must be three numeric digits 1-3 in any order,  e.g.,
--            123  or  321.   If  it is not specified, <STRONG>ncurses</STRONG> uses
-+            must  be three numeric digits 1-3 in any order, e.g.,
-+            123 or 321.  If it is  not  specified,  <STRONG>ncurses</STRONG>  uses
-             132.
- 
-        NCURSES_ASSUMED_COLORS
--            Override the compiled-in assumption that  the  termi-
--            nal's   default   colors   are   white-on-black  (see
--            <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).  You may set the foreground  and
--            background  color  values with this environment vari-
--            able by proving a  2-element  list:  foreground,back-
--            ground.   For  example, to tell ncurses to not assume
--            anything about the colors, set this to  "-1,-1".   To
--            make  it  green-on-black, set it to "2,0".  Any posi-
-+            Override  the  compiled-in assumption that the termi-
-+            nal's  default   colors   are   white-on-black   (see
-+            <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You may set the foreground and
-+            background color values with this  environment  vari-
-+            able  by  proving  a 2-element list: foreground,back-
-+            ground.  For example, to tell ncurses to  not  assume
-+            anything  about  the colors, set this to "-1,-1".  To
-+            make it green-on-black, set it to "2,0".   Any  posi-
-             tive value from zero to the terminfo <STRONG>max_colors</STRONG> value
-             is allowed.
- 
-        NCURSES_GPM_TERMS
--            This  applies  only  to ncurses configured to use the
-+            This applies only to ncurses configured  to  use  the
-             GPM interface.
- 
-             If present, the environment variable is a list of one
--            or  more  terminal names against which the TERM envi-
--            ronment variable is matched.  Setting it to an  empty
--            value  disables the GPM interface; using the built-in
-+            or more terminal names against which the  TERM  envi-
-+            ronment  variable is matched.  Setting it to an empty
-+            value disables the GPM interface; using the  built-in
-             support for xterm, etc.
- 
--            If the environment variable is absent,  ncurses  will
-+            If  the  environment variable is absent, ncurses will
-             attempt to open GPM if TERM contains "linux".
- 
-        NCURSES_NO_HARD_TABS
--            <STRONG>Ncurses</STRONG>  may  use tabs as part of the cursor movement
--            optimization.  In some cases,  your  terminal  driver
--            may  not handle these properly.  Set this environment
-+            <STRONG>Ncurses</STRONG> may use tabs as part of the  cursor  movement
-+            optimization.   In  some  cases, your terminal driver
-+            may not handle these properly.  Set this  environment
-             variable to disable the feature.  You can also adjust
-             your <STRONG>stty</STRONG> settings to avoid the problem.
- 
-        NCURSES_NO_MAGIC_COOKIES
-             Some  terminals  use  a  magic-cookie  feature  which
--            requires special handling to  make  highlighting  and
--            other  video  attributes  display  properly.  You can
--            suppress the highlighting entirely for  these  termi-
--            nals by setting this environment variable.
-+            requires  special  handling  to make highlighting and
-+            other video attributes  display  properly.   You  can
-+            suppress   the   highlighting   entirely   for  these
-+            terminals by setting this environment variable.
- 
-        NCURSES_NO_PADDING
--            Most  of  the  terminal  descriptions in the terminfo
--            database are written for real  "hardware"  terminals.
--            Many  people  use  terminal  emulators which run in a
--            windowing environment and use  curses-based  applica-
--            tions.   Terminal  emulators can duplicate all of the
-+            Most of the terminal  descriptions  in  the  terminfo
-+            database  are  written for real "hardware" terminals.
-+            Many people use terminal emulators  which  run  in  a
-+            windowing  environment  and use curses-based applica-
-+            tions.  Terminal emulators can duplicate all  of  the
-             important aspects of a hardware terminal, but they do
--            not  have the same limitations.  The chief limitation
--            of a hardware terminal from the  standpoint  of  your
-+            not have the same limitations.  The chief  limitation
-+            of  a  hardware  terminal from the standpoint of your
-             application is the management of dataflow, i.e., tim-
-             ing.  Unless a hardware terminal is interfaced into a
--            terminal  concentrator  (which does flow control), it
--            (or your application) must manage dataflow,  prevent-
--            ing  overruns.   The  cheapest  solution (no hardware
-+            terminal concentrator (which does flow  control),  it
-+            (or  your application) must manage dataflow, prevent-
-+            ing overruns.  The  cheapest  solution  (no  hardware
-             cost) is for your program to do this by pausing after
--            operations  that  the  terminal  does slowly, such as
-+            operations that the terminal  does  slowly,  such  as
-             clearing the display.
- 
--            As a result, many  terminal  descriptions  (including
--            the  vt100)  have delay times embedded.  You may wish
--            to use these descriptions, but not want  to  pay  the
-+            As  a  result,  many terminal descriptions (including
-+            the vt100) have delay times embedded.  You  may  wish
-+            to  use  these  descriptions, but not want to pay the
-             performance penalty.
- 
--            Set  the NCURSES_NO_PADDING symbol to disable all but
--            mandatory padding.  Mandatory padding is  used  as  a
-+            Set the NCURSES_NO_PADDING symbol to disable all  but
-+            mandatory  padding.   Mandatory  padding is used as a
-             part of special control sequences such as <EM>flash</EM>.
- 
-        NCURSES_NO_SETBUF
--            Normally  <STRONG>ncurses</STRONG> enables buffered output during ter-
--            minal initialization.   This  is  done  (as  in  SVr4
--            curses)  for  performance  reasons.  For testing pur-
-+            Normally <STRONG>ncurses</STRONG> enables buffered output during  ter-
-+            minal  initialization.   This  is  done  (as  in SVr4
-+            curses) for performance reasons.   For  testing  pur-
-             poses, both of <STRONG>ncurses</STRONG> and certain applications, this
-             feature    is    made    optional.     Setting    the
-             NCURSES_NO_SETBUF variable disables output buffering,
--            leaving  the  output  in  the  original (usually line
-+            leaving the output  in  the  original  (usually  line
-             buffered) mode.
- 
-        NCURSES_NO_UTF8_ACS
-             During initialization, the <STRONG>ncurses</STRONG> library checks for
--            special  cases where VT100 line-drawing (and the cor-
--            responding  alternate  character  set   capabilities)
--            described  in  the  terminfo are known to be missing.
--            Specifically, when running in  a  UTF-8  locale,  the
--            Linux  console  emulator  and  the GNU screen program
--            ignore these.  Ncurses checks  the  TERM  environment
--            variable  for  these.   For  other special cases, you
--            should set this  environment  variable.   Doing  this
--            tells  ncurses to use Unicode values which correspond
-+            special cases where VT100 line-drawing (and the  cor-
-+            responding   alternate  character  set  capabilities)
-+            described in the terminfo are known  to  be  missing.
-+            Specifically,  when  running  in  a UTF-8 locale, the
-+            Linux console emulator and  the  GNU  screen  program
-+            ignore  these.   Ncurses  checks the TERM environment
-+            variable for these.  For  other  special  cases,  you
-+            should  set  this  environment  variable.  Doing this
-+            tells ncurses to use Unicode values which  correspond
-             to the VT100 line-drawing glyphs.  That works for the
-             special cases cited, and is likely to work for termi-
-             nal emulators.
- 
--            When setting this variable, you should set  it  to  a
--            nonzero  value.   Setting it to zero (or to a nonnum-
--            ber) disables  the  special  check  for  "linux"  and
-+            When  setting  this  variable, you should set it to a
-+            nonzero value.  Setting it to zero (or to  a  nonnum-
-+            ber)  disables  the  special  check  for  "linux" and
-             "screen".
- 
--            As   an  alternative  to  the  environment  variable,
--            ncurses checks for an  extended  terminfo  capability
--            <STRONG>U8</STRONG>.   This  is a numeric capability which can be com-
-+            As  an  alternative  to  the  environment   variable,
-+            ncurses  checks  for  an extended terminfo capability
-+            <STRONG>U8</STRONG>.  This is a numeric capability which can  be  com-
-             piled using <STRONG>tic</STRONG> <STRONG>-x</STRONG>.  For example
- 
-             # linux console, if patched to provide working
-@@ -985,43 +988,43 @@
-                                  U8#1, use=xterm,
- 
-             The name "U8" is chosen to be two characters, to per-
--            mit  it  to be used by applications that use ncurses'
-+            mit it to be used by applications that  use  ncurses'
-             termcap interface.
- 
-        NCURSES_TRACE
--            During initialization, the <STRONG>ncurses</STRONG> debugging  library
--            checks  the  NCURSES_TRACE symbol.  If it is defined,
-+            During  initialization, the <STRONG>ncurses</STRONG> debugging library
-+            checks the NCURSES_TRACE symbol.  If it  is  defined,
-             to a numeric value, <STRONG>ncurses</STRONG> calls the <STRONG>trace</STRONG> function,
-             using that value as the argument.
- 
--            The  argument  values, which are defined in <STRONG>curses.h</STRONG>,
--            provide several types of information.   When  running
--            with  traces enabled, your application will write the
-+            The argument values, which are defined  in  <STRONG>curses.h</STRONG>,
-+            provide  several  types of information.  When running
-+            with traces enabled, your application will write  the
-             file <STRONG>trace</STRONG> to the current directory.
- 
--       TERM Denotes your terminal type.  Each  terminal  type  is
-+       TERM Denotes  your  terminal  type.  Each terminal type is
-             distinct, though many are similar.
- 
-        TERMCAP
-             If the <STRONG>ncurses</STRONG> library has been configured with <EM>term-</EM>
--            <EM>cap</EM> support, <STRONG>ncurses</STRONG>  will  check  for  a  terminal's
-+            <EM>cap</EM>  support,  <STRONG>ncurses</STRONG>  will  check  for a terminal's
-             description in termcap form if it is not available in
-             the terminfo database.
- 
--            The  TERMCAP  symbol  contains  either   a   terminal
--            description  (with  newlines stripped out), or a file
--            name telling where the  information  denoted  by  the
--            TERM  symbol  exists.   In  either  case,  setting it
--            directs <STRONG>ncurses</STRONG> to ignore the usual  place  for  this
-+            The   TERMCAP   symbol  contains  either  a  terminal
-+            description (with newlines stripped out), or  a  file
-+            name  telling  where  the  information denoted by the
-+            TERM symbol  exists.   In  either  case,  setting  it
-+            directs  <STRONG>ncurses</STRONG>  to  ignore the usual place for this
-             information, e.g., /etc/termcap.
- 
-        TERMINFO
-             Overrides the directory in which <STRONG>ncurses</STRONG> searches for
-             your terminal description.  This is the simplest, but
--            not  the  only way to change the list of directories.
-+            not the only way to change the list  of  directories.
-             The complete list of directories in order follows:
- 
--            <STRONG>o</STRONG>   the last directory to  which  <STRONG>ncurses</STRONG>  wrote,  if
-+            <STRONG>o</STRONG>   the  last  directory  to  which <STRONG>ncurses</STRONG> wrote, if
-                 any, is searched first
- 
-             <STRONG>o</STRONG>   the directory specified by the TERMINFO symbol
-@@ -1030,62 +1033,70 @@
- 
-             <STRONG>o</STRONG>   directories listed in the TERMINFO_DIRS symbol
- 
--            <STRONG>o</STRONG>   one  or  more directories whose names are config-
-+            <STRONG>o</STRONG>   one or more directories whose names  are  config-
-                 ured and compiled into the ncurses library, e.g.,
-                 /usr/share/terminfo
- 
-        TERMINFO_DIRS
--            Specifies  a list of directories to search for termi-
--            nal descriptions.  The list is  separated  by  colons
--            (i.e.,  ":") on Unix, semicolons on OS/2 EMX.  All of
-+            Specifies a list of directories to search for  termi-
-+            nal  descriptions.   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  a  subdirectory  named for the first letter of
-+            makes a subdirectory named for the  first  letter  of
-             the terminal names therein.
- 
-+            If <STRONG>ncurses</STRONG> is built with a hashed database, then each
-+            entry in this list can also be the path of the corre-
-+            sponding database file.
-+
-+            If  <STRONG>ncurses</STRONG> is built with a support for reading term-
-+            cap files directly, then an entry in this list may be
-+            the path of a termcap file.
-+
-        TERMPATH
--            If TERMCAP does not hold a  file  name  then  <STRONG>ncurses</STRONG>
--            checks  the TERMPATH symbol.  This is a list of file-
--            names separated by spaces or colons  (i.e.,  ":")  on
-+            If  TERMCAP  does  not  hold a file name then <STRONG>ncurses</STRONG>
-+            checks the TERMPATH symbol.  This is a list of  file-
-+            names  separated  by  spaces or colons (i.e., ":") on
-             Unix, semicolons on OS/2 EMX.  If the TERMPATH symbol
--            is not set, <STRONG>ncurses</STRONG> looks in the files  /etc/termcap,
--            /usr/share/misc/termcap  and  $HOME/.termcap, in that
-+            is  not set, <STRONG>ncurses</STRONG> looks in the files /etc/termcap,
-+            /usr/share/misc/termcap and $HOME/.termcap,  in  that
-             order.
- 
--       The library may be configured to disregard  the  following
--       variables  when  the current user is the superuser (root),
--       or if the application uses setuid or  setgid  permissions:
-+       The  library  may be configured to disregard the following
-+       variables when the current user is the  superuser  (root),
-+       or  if  the application uses setuid or setgid permissions:
-        $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
- 
- 
- </PRE>
- <H2>ALTERNATE CONFIGURATIONS</H2><PRE>
--       Several  different  configurations are possible, depending
--       on  the  configure  script  options  used  when   building
--       <STRONG>ncurses</STRONG>.   There  are a few main options whose effects are
-+       Several different configurations are  possible,  depending
-+       on   the  configure  script  options  used  when  building
-+       <STRONG>ncurses</STRONG>.  There are a few main options whose  effects  are
-        visible to the applications developer using <STRONG>ncurses</STRONG>:
- 
-        --disable-overwrite
--            The standard include for <STRONG>ncurses</STRONG> is as noted in  <STRONG>SYN-</STRONG>
-+            The  standard include for <STRONG>ncurses</STRONG> is as noted in <STRONG>SYN-</STRONG>
-             <STRONG>OPSIS</STRONG>:
- 
-             <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
- 
--            This  option is used to avoid filename conflicts when
--            <STRONG>ncurses</STRONG> is not the main implementation of  curses  of
--            the  computer.   If  <STRONG>ncurses</STRONG>  is  installed disabling
--            overwrite, it puts its  headers  in  a  subdirectory,
-+            This option is used to avoid filename conflicts  when
-+            <STRONG>ncurses</STRONG>  is  not the main implementation of curses of
-+            the computer.   If  <STRONG>ncurses</STRONG>  is  installed  disabling
-+            overwrite,  it  puts  its  headers in a subdirectory,
-             e.g.,
- 
-             <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
- 
--            It  also  omits a symbolic link which would allow you
-+            It also omits a symbolic link which would  allow  you
-             to use <STRONG>-lcurses</STRONG> to build executables.
- 
-        --enable-widec
--            The configure script renames the library and (if  the
--            <STRONG>--disable-overwrite</STRONG>  option  is used) puts the header
-+            The  configure script renames the library and (if the
-+            <STRONG>--disable-overwrite</STRONG> option is used) puts  the  header
-             files  in  a  different  subdirectory.   All  of  the
--            library  names  have  a  "w"  appended to them, i.e.,
-+            library names have a  "w"  appended  to  them,  i.e.,
-             instead of
- 
-             <STRONG>-lncurses</STRONG>
-@@ -1095,16 +1106,16 @@
-             <STRONG>-lncursesw</STRONG>
- 
-             You must also define <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG> when com-
--            piling  for  the  wide-character  library  to use the
--            extended (wide-character)  functions.   The  <STRONG>curses.h</STRONG>
--            file   which  is  installed  for  the  wide-character
--            library is designed to be compatible with the  normal
-+            piling for the  wide-character  library  to  use  the
-+            extended  (wide-character)  functions.   The <STRONG>curses.h</STRONG>
-+            file  which  is  installed  for  the   wide-character
-+            library  is designed to be compatible with the normal
-             library's header.  Only the size of the <STRONG>WINDOW</STRONG> struc-
--            ture differs, and very few applications require  more
--            than  a  pointer  to  <STRONG>WINDOW</STRONG>s.   If  the  headers are
--            installed  allowing  overwrite,  the   wide-character
--            library's  headers should be installed last, to allow
--            applications to be built using  either  library  from
-+            ture  differs, and very few applications require more
-+            than a  pointer  to  <STRONG>WINDOW</STRONG>s.   If  the  headers  are
-+            installed   allowing  overwrite,  the  wide-character
-+            library's headers should be installed last, to  allow
-+            applications  to  be  built using either library from
-             the same set of headers.
- 
-        --with-shared
-@@ -1114,16 +1125,16 @@
-        --with-debug
- 
-        --with-profile
--            The  shared  and normal (static) library names differ
--            by   their   suffixes,   e.g.,   <STRONG>libncurses.so</STRONG>    and
--            <STRONG>libncurses.a</STRONG>.   The debug and profiling libraries add
--            a "_g" and a "_p" to  the  root  names  respectively,
-+            The shared and normal (static) library  names  differ
-+            by    their   suffixes,   e.g.,   <STRONG>libncurses.so</STRONG>   and
-+            <STRONG>libncurses.a</STRONG>.  The debug and profiling libraries  add
-+            a  "_g"  and  a  "_p" to the root names respectively,
-             e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
- 
-        --with-trace
--            The  <STRONG>trace</STRONG>  function  normally  resides  in the debug
-+            The <STRONG>trace</STRONG> function  normally  resides  in  the  debug
-             library, but it is sometimes useful to configure this
--            in  the  shared  library.   Configure  scripts should
-+            in the  shared  library.   Configure  scripts  should
-             check for the function's existence rather than assum-
-             ing it is always in the debug library.
- 
-@@ -1131,14 +1142,14 @@
- </PRE>
- <H2>FILES</H2><PRE>
-        /usr/share/tabset
--            directory  containing  initialization  files  for the
-+            directory containing  initialization  files  for  the
-             terminal capability database /usr/share/terminfo ter-
-             minal capability database
- 
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  and  related  pages whose names begin "curs_"
-+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> and related pages whose  names  begin  "curs_"
-        for detailed routine descriptions.
-        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
- 
-@@ -1148,52 +1159,61 @@
-        The  <STRONG>ncurses</STRONG>  library  can  be  compiled  with  an  option
-        (<STRONG>-DUSE_GETCAP</STRONG>) that falls back to the old-style /etc/term-
-        cap file if the terminal setup code cannot find a terminfo
--       entry  corresponding  to <STRONG>TERM</STRONG>.  Use of this feature is not
--       recommended, as it essentially includes an entire  termcap
--       compiler  in the <STRONG>ncurses</STRONG> startup code, at significant cost
-+       entry corresponding to <STRONG>TERM</STRONG>.  Use of this feature  is  not
-+       recommended,  as it essentially includes an entire termcap
-+       compiler in the <STRONG>ncurses</STRONG> startup code, at significant  cost
-        in core and startup cycles.
- 
--       The <STRONG>ncurses</STRONG>  library  includes  facilities  for  capturing
--       mouse  events on certain terminals (including xterm).  See
-+       The  <STRONG>ncurses</STRONG>  library  includes  facilities  for capturing
-+       mouse events on certain terminals (including xterm).   See
-        the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual page for details.
- 
--       The <STRONG>ncurses</STRONG> library includes facilities for responding  to
--       window  resizing  events,  e.g., when running in an xterm.
--       See the <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>  manual  pages  for
--       details.   In addition, the library may be configured with
-+       The  <STRONG>ncurses</STRONG> library includes facilities for responding to
-+       window resizing events, e.g., when running  in  an  xterm.
-+       See  the  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>  and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for
-+       details.  In addition, the library may be configured  with
-        a SIGWINCH handler.
- 
--       The <STRONG>ncurses</STRONG> library extends the fixed set of function  key
--       capabilities  of  terminals  by  allowing  the application
--       designer to define additional key  sequences  at  runtime.
-+       The  <STRONG>ncurses</STRONG> library extends the fixed set of function key
-+       capabilities of  terminals  by  allowing  the  application
-+       designer  to  define  additional key sequences at runtime.
-        See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> man-
-        ual pages for details.
- 
-        The <STRONG>ncurses</STRONG> library can exploit the capabilities of termi-
--       nals  which  implement the ISO-6429 SGR 39 and SGR 49 con-
-+       nals which implement the ISO-6429 SGR 39 and SGR  49  con-
-        trols, which allow an application to reset the terminal to
--       its  original  foreground and background colors.  From the
--       users' perspective, the application is able to  draw  col-
--       ored  text  on  a  background  whose color is set indepen-
--       dently, providing better  control  over  color  contrasts.
-+       its original foreground and background colors.   From  the
-+       users'  perspective,  the application is able to draw col-
-+       ored text on a background  whose  color  is  set  indepen-
-+       dently,  providing  better  control  over color contrasts.
-        See the <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details.
- 
--       The  <STRONG>ncurses</STRONG>  library  includes  a  function for directing
--       application output to a printer attached to  the  terminal
-+       The <STRONG>ncurses</STRONG> library  includes  a  function  for  directing
-+       application  output  to a printer attached to the terminal
-        device.  See the <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
- 
- 
- </PRE>
- <H2>PORTABILITY</H2><PRE>
--       The  <STRONG>ncurses</STRONG>  library is intended to be BASE-level confor-
-+       The <STRONG>ncurses</STRONG> library is intended to be  BASE-level  confor-
-        mant with XSI Curses.  The EXTENDED XSI Curses functional-
-        ity (including color support) is supported.
- 
--       A  small  number of local differences (that is, individual
--       differences between the XSI Curses and <STRONG>ncurses</STRONG> calls)  are
--       described  in  <STRONG>PORTABILITY</STRONG>  sections  of  the  library man
-+       A small number of local differences (that  is,  individual
-+       differences  between the XSI Curses and <STRONG>ncurses</STRONG> calls) are
-+       described in  <STRONG>PORTABILITY</STRONG>  sections  of  the  library  man
-        pages.
- 
-+       Unlike  other  implementations, this one checks parameters
-+       such as pointers to WINDOW structures to ensure  they  are
-+       not  null.  The main reason for providing this behavior is
-+       to guard against programmer error.  The standard interface
-+       does not provide a way for the library to tell an applica-
-+       tion which  of  several  possible  errors  were  detected.
-+       Relying  on  this (or some other) extension will adversely
-+       affect the portability of curses applications.
-+
-        This implementation also contains several extensions:
- 
-        <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-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 @@
- 
-        <STRONG>--terminfo-dirs</STRONG>
-               echos the $TERMINFO_DIRS directory list, e.g.,
--              /usr/local/ncurses/lib/terminfo:/usr/share/terminfo
-+              /usr/local/ncurses/share/terminfo:/usr/share/ter-
-+              minfo
- 
-        <STRONG>--termpath</STRONG>
-               echos  the  $TERMPATH  termcap list, if support for
-@@ -118,7 +119,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- </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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 2008-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tabs.1,v 1.8 2010/12/04 18:40:45 tom Exp @
-+  * @Id: tabs.1,v 1.9 2011/12/17 23:31:59 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -156,7 +156,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: term.7,v 1.22 2010/12/04 18:41:07 tom Exp @
-+  * @Id: term.7,v 1.23 2011/12/17 23:32:17 tom Exp @
- -->
- <HTML>
- <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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 2010 Free Software Foundation, Inc.                        *
-+  * Copyright (c) 2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: term_variables.3x,v 1.2 2010/12/04 18:38:55 tom Exp @
-+  * @Id: term_variables.3x,v 1.3 2011/12/17 23:31:50 tom Exp @
- -->
- <HTML>
- <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-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 @@
-   ****************************************************************************
-   * @Id: terminfo.head,v 1.18 2010/07/31 16:08:48 tom Exp @
-   * Head of terminfo man page ends here
--  * @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 @
-   * Beginning of terminfo.tail file
-   * This file is part of ncurses.
-   * See "terminfo.head" for copyright.
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
-        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-@@ -989,13 +989,14 @@
-                                                bottom margins to
-                                                #1, #2
- 
--        The XSI Curses  standard  added  these.   They  are  some
--        post-4.1  versions  of System V curses, e.g., Solaris 2.5
--        and IRIX 6.x.  The <STRONG>ncurses</STRONG> termcap  names  for  them  are
--        invented; according to the XSI Curses standard, they have
--        no termcap names.  If your compiled terminfo entries  use
--        these,  they  may  not be binary-compatible with System V
--        terminfo entries after SVr4.1; beware!
-+        The XSI Curses standard added  these  hardcopy  capabili-
-+        ties.  They were used in some post-4.1 versions of System
-+        V curses, e.g., Solaris 2.5 and IRIX 6.x.  Except for <STRONG>YI</STRONG>,
-+        the <STRONG>ncurses</STRONG> termcap names for them are invented.  Accord-
-+        ing to the XSI Curses  standard,  they  have  no  termcap
-+        names.  If your compiled terminfo entries use these, they
-+        may not  be  binary-compatible  with  System  V  terminfo
-+        entries after SVr4.1; beware!
- 
- 
-                 <STRONG>Variable</STRONG>         <STRONG>Cap-</STRONG>   <STRONG>TCap</STRONG>     <STRONG>Description</STRONG>
-@@ -1015,13 +1016,15 @@
-         set_a_attributes         sgr1   sA   Define second set of
-                                              video attributes
-                                              #1-#6
--        set_pglen_inch           slengthsL   YI Set page length
--                                             to #1 hundredth of
--                                             an inch
-+        set_pglen_inch           slengthYI   Set page length to
-+                                             #1 hundredth of an
-+                                             inch (some implemen-
-+                                             tations use sL for
-+                                             termcap).
- 
-    <STRONG>A</STRONG> <STRONG>Sample</STRONG> <STRONG>Entry</STRONG>
-        The following entry, describing an ANSI-standard terminal,
--       is  representative  of  what a <STRONG>terminfo</STRONG> entry for a modern
-+       is representative of what a <STRONG>terminfo</STRONG> entry  for  a  modern
-        terminal typically looks like.
- 
-      ansi|ansi/pc-term compatible with color,
-@@ -1045,180 +1048,181 @@
-              sgr0=\E[0;10m, tbc=\E[2g, u6=\E[%d;%dR, u7=\E[6n,
-              u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%p1%dd,
- 
--       Entries may continue onto multiple lines by placing  white
--       space  at  the  beginning  of  each line except the first.
--       Comments may be included on lines  beginning  with  ``#''.
-+       Entries  may continue onto multiple lines by placing white
-+       space at the beginning of  each  line  except  the  first.
-+       Comments  may  be  included on lines beginning with ``#''.
-        Capabilities in <EM>terminfo</EM> are of three types: Boolean capa-
-        bilities which indicate that the terminal has some partic-
--       ular  feature, numeric capabilities giving the size of the
--       terminal or the size  of  particular  delays,  and  string
--       capabilities,  which  give a sequence which can be used to
-+       ular feature, numeric capabilities giving the size of  the
-+       terminal  or  the  size  of  particular delays, and string
-+       capabilities, which give a sequence which can be  used  to
-        perform particular terminal operations.
- 
- 
-    <STRONG>Types</STRONG> <STRONG>of</STRONG> <STRONG>Capabilities</STRONG>
--       All capabilities have names.  For instance, the fact  that
--       ANSI-standard  terminals  have <EM>automatic</EM> <EM>margins</EM> (i.e., an
--       automatic return and line-feed when the end of a  line  is
--       reached)  is  indicated  by  the capability <STRONG>am</STRONG>.  Hence the
-+       All  capabilities have names.  For instance, the fact that
-+       ANSI-standard terminals have <EM>automatic</EM> <EM>margins</EM>  (i.e.,  an
-+       automatic  return  and line-feed when the end of a line is
-+       reached) is indicated by the  capability  <STRONG>am</STRONG>.   Hence  the
-        description of ansi includes <STRONG>am</STRONG>.  Numeric capabilities are
--       followed  by  the character `#' and then a positive value.
--       Thus <STRONG>cols</STRONG>, which indicates the number of columns the  ter-
--       minal  has,  gives  the  value  `80' for ansi.  Values for
-+       followed by the character `#' and then a  positive  value.
-+       Thus  <STRONG>cols</STRONG>, which indicates the number of columns the ter-
-+       minal has, gives the value  `80'  for  ansi.   Values  for
-        numeric capabilities may be specified in decimal, octal or
--       hexadecimal,  using the C programming language conventions
-+       hexadecimal, using the C programming language  conventions
-        (e.g., 255, 0377 and 0xff or 0xFF).
- 
--       Finally, string valued capabilities, such as <STRONG>el</STRONG> (clear  to
-+       Finally,  string valued capabilities, such as <STRONG>el</STRONG> (clear to
-        end of line sequence) are given by the two-character code,
--       an `=', and then a string ending  at  the  next  following
-+       an  `=',  and  then  a string ending at the next following
-        `,'.
- 
--       A  number  of  escape sequences are provided in the string
-+       A number of escape sequences are provided  in  the  string
-        valued capabilities for easy encoding of characters there.
--       Both  <STRONG>\E</STRONG>  and  <STRONG>\e</STRONG> map to an ESCAPE character, <STRONG>^x</STRONG> maps to a
--       control-x for any appropriate x, and the sequences  <STRONG>\n</STRONG>  <STRONG>\l</STRONG>
--       <STRONG>\r</STRONG>  <STRONG>\t</STRONG>  <STRONG>\b</STRONG>  <STRONG>\f</STRONG>  <STRONG>\s</STRONG> give a newline, line-feed, return, tab,
-+       Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character, <STRONG>^x</STRONG>  maps  to  a
-+       control-x  for  any appropriate x, and the sequences <STRONG>\n</STRONG> <STRONG>\l</STRONG>
-+       <STRONG>\r</STRONG> <STRONG>\t</STRONG> <STRONG>\b</STRONG> <STRONG>\f</STRONG> <STRONG>\s</STRONG> give a  newline,  line-feed,  return,  tab,
-        backspace, form-feed, and space.  Other escapes include <STRONG>\^</STRONG>
--       for  <STRONG>^</STRONG>, <STRONG>\\</STRONG> for <STRONG>\</STRONG>, <STRONG>\</STRONG>, for comma, <STRONG>\:</STRONG> for <STRONG>:</STRONG>, and <STRONG>\0</STRONG> for null.
--       (<STRONG>\0</STRONG> will produce \200, which does not terminate  a  string
-+       for <STRONG>^</STRONG>, <STRONG>\\</STRONG> for <STRONG>\</STRONG>, <STRONG>\</STRONG>, for comma, <STRONG>\:</STRONG> for <STRONG>:</STRONG>, and <STRONG>\0</STRONG> for  null.
-+       (<STRONG>\0</STRONG>  will  produce \200, which does not terminate a string
-        but behaves as a null character on most terminals, provid-
--       ing CS7 is specified.  See <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>.)  Finally,  characters
-+       ing  CS7 is specified.  See <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>.)  Finally, characters
-        may be given as three octal digits after a <STRONG>\</STRONG>.
- 
--       A  delay  in  milliseconds may appear anywhere in a string
--       capability, enclosed in $&lt;..&gt; brackets, as in  <STRONG>el</STRONG>=\EK$&lt;5&gt;,
--       and  padding  characters  are supplied by <EM>tputs</EM> to provide
--       this delay.  The delay must be a number with at  most  one
-+       A delay in milliseconds may appear anywhere  in  a  string
-+       capability,  enclosed in $&lt;..&gt; brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;,
-+       and padding characters are supplied by  <EM>tputs</EM>  to  provide
-+       this  delay.   The delay must be a number with at most one
-        decimal place of precision; it may be followed by suffixes
--       `*' or '/' or both.  A  `*'  indicates  that  the  padding
--       required  is  proportional to the number of lines affected
--       by the  operation,  and  the  amount  given  is  the  per-
--       affected-unit  padding  required.   (In the case of insert
-+       `*'  or  '/'  or  both.   A `*' indicates that the padding
-+       required is proportional to the number of  lines  affected
-+       by  the  operation,  and  the  amount  given  is  the per-
-+       affected-unit padding required.  (In the  case  of  insert
-        character,  the  factor  is  still  the  number  of  <EM>lines</EM>
--       affected.)   Normally,  padding  is advisory if the device
--       has the <STRONG>xon</STRONG> capability; it is used  for  cost  computation
--       but  does not trigger delays.  A `/' suffix indicates that
--       the padding is mandatory and forces a delay of  the  given
--       number  of  milliseconds  even on devices for which <STRONG>xon</STRONG> is
-+       affected.)  Normally, padding is advisory  if  the  device
-+       has  the  <STRONG>xon</STRONG>  capability; it is used for cost computation
-+       but does not trigger delays.  A `/' suffix indicates  that
-+       the  padding  is mandatory and forces a delay of the given
-+       number of milliseconds even on devices for  which  <STRONG>xon</STRONG>  is
-        present to indicate flow control.
- 
--       Sometimes individual capabilities must be  commented  out.
--       To  do this, put a period before the capability name.  For
-+       Sometimes  individual  capabilities must be commented out.
-+       To do this, put a period before the capability name.   For
-        example, see the second <STRONG>ind</STRONG> in the example above.
- 
- 
-    <STRONG>Fetching</STRONG> <STRONG>Compiled</STRONG> <STRONG>Descriptions</STRONG>
--       If the environment variable TERMINFO is set, it is  inter-
--       preted  as the pathname of a directory containing the com-
-+       If  the environment variable TERMINFO is set, it is inter-
-+       preted as the pathname of a directory containing the  com-
-        piled description you are working on.  Only that directory
-        is searched.
- 
--       If  TERMINFO  is  not set, the <STRONG>ncurses</STRONG> version of the ter-
--       minfo reader code  will  instead  look  in  the  directory
--       <STRONG>$HOME/.terminfo</STRONG>  for  a compiled description.  If it fails
--       to find one  there,  and  the  environment  variable  TER-
--       MINFO_DIRS  is set, it will interpret the contents of that
--       variable as a list of colon- separated directories  to  be
--       searched  (an  empty  entry is interpreted as a command to
--       search <EM>/usr/share/terminfo</EM>).  If no description  is  found
--       in  any of the TERMINFO_DIRS directories, the fetch fails.
-+       If TERMINFO is not set, the <STRONG>ncurses</STRONG> version  of  the  ter-
-+       minfo  reader  code  will  instead  look  in the directory
-+       <STRONG>$HOME/.terminfo</STRONG> for a compiled description.  If  it  fails
-+       to  find  one  there,  and  the  environment variable TER-
-+       MINFO_DIRS is set, it will interpret the contents of  that
-+       variable  as  a  list  of colon- separated directories (or
-+       database files) to be searched (an empty entry  is  inter-
-+       preted as a command to search <EM>/usr/share/terminfo</EM>).  If no
-+       description is found in any of the TERMINFO_DIRS  directo-
-+       ries, the fetch fails.
- 
--       If neither TERMINFO nor TERMINFO_DIRS  is  set,  the  last
--       place   tried  will  be  the  system  terminfo  directory,
-+       If  neither  TERMINFO  nor  TERMINFO_DIRS is set, the last
-+       place  tried  will  be  the  system  terminfo   directory,
-        <EM>/usr/share/terminfo</EM>.
- 
--       (Neither the  <STRONG>$HOME/.terminfo</STRONG>  lookups  nor  TERMINFO_DIRS
--       extensions   are  supported  under  stock  System  V  ter-
-+       (Neither  the  <STRONG>$HOME/.terminfo</STRONG>  lookups  nor TERMINFO_DIRS
-+       extensions  are  supported  under  stock  System  V   ter-
-        minfo/curses.)
- 
- 
-    <STRONG>Preparing</STRONG> <STRONG>Descriptions</STRONG>
--       We now outline how to prepare descriptions  of  terminals.
--       The  most  effective way to prepare a terminal description
--       is by imitating the description of a similar  terminal  in
--       <EM>terminfo</EM>  and  to  build up a description gradually, using
-+       We  now  outline how to prepare descriptions of terminals.
-+       The most effective way to prepare a  terminal  description
-+       is  by  imitating the description of a similar terminal in
-+       <EM>terminfo</EM> and to build up a  description  gradually,  using
-        partial descriptions with <EM>vi</EM> or some other screen-oriented
--       program  to  check that they are correct.  Be aware that a
-+       program to check that they are correct.  Be aware  that  a
-        very unusual terminal may expose deficiencies in the abil-
--       ity  of  the  <EM>terminfo</EM>  file to describe it or bugs in the
-+       ity of the <EM>terminfo</EM> file to describe it  or  bugs  in  the
-        screen-handling code of the test program.
- 
--       To get the padding for insert line right (if the  terminal
-+       To  get the padding for insert line right (if the terminal
-        manufacturer did not document it) a severe test is to edit
--       a large file at 9600 baud, delete 16 or so lines from  the
--       middle  of  the screen, then hit the `u' key several times
--       quickly.  If the terminal messes up, more padding is  usu-
--       ally  needed.  A similar test can be used for insert char-
-+       a  large file at 9600 baud, delete 16 or so lines from the
-+       middle of the screen, then hit the `u' key  several  times
-+       quickly.   If the terminal messes up, more padding is usu-
-+       ally needed.  A similar test can be used for insert  char-
-        acter.
- 
- 
-    <STRONG>Basic</STRONG> <STRONG>Capabilities</STRONG>
--       The number of columns on each line  for  the  terminal  is
--       given  by the <STRONG>cols</STRONG> numeric capability.  If the terminal is
--       a CRT, then the number of lines on the screen is given  by
-+       The  number  of  columns  on each line for the terminal is
-+       given by the <STRONG>cols</STRONG> numeric capability.  If the terminal  is
-+       a  CRT, then the number of lines on the screen is given by
-        the <STRONG>lines</STRONG> capability.  If the terminal wraps around to the
--       beginning of the next line when it reaches the right  mar-
-+       beginning  of the next line when it reaches the right mar-
-        gin, then it should have the <STRONG>am</STRONG> capability.  If the termi-
--       nal can clear its screen, leaving the cursor in  the  home
--       position,  then this is given by the <STRONG>clear</STRONG> string capabil-
--       ity.  If the terminal overstrikes (rather than clearing  a
--       position  when  a character is struck over) then it should
--       have the <STRONG>os</STRONG> capability.  If the  terminal  is  a  printing
--       terminal,  with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>.
--       (<STRONG>os</STRONG> applies to storage scope terminals, such as  TEKTRONIX
--       4010  series, as well as hard copy and APL terminals.)  If
-+       nal  can  clear its screen, leaving the cursor in the home
-+       position, then this is given by the <STRONG>clear</STRONG> string  capabil-
-+       ity.   If the terminal overstrikes (rather than clearing a
-+       position when a character is struck over) then  it  should
-+       have  the  <STRONG>os</STRONG>  capability.   If the terminal is a printing
-+       terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and  <STRONG>os</STRONG>.
-+       (<STRONG>os</STRONG>  applies to storage scope terminals, such as TEKTRONIX
-+       4010 series, as well as hard copy and APL terminals.)   If
-        there is a code to move the cursor to the left edge of the
-        current row, give this as <STRONG>cr</STRONG>.  (Normally this will be car-
--       riage return, control M.)  If there is a code  to  produce
-+       riage  return,  control M.)  If there is a code to produce
-        an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
- 
--       If  there is a code to move the cursor one position to the
--       left (such as backspace) that capability should  be  given
--       as  <STRONG>cub1</STRONG>.   Similarly, codes to move to the right, up, and
-+       If there is a code to move the cursor one position to  the
-+       left  (such  as backspace) that capability should be given
-+       as <STRONG>cub1</STRONG>.  Similarly, codes to move to the right,  up,  and
-        down should be given as <STRONG>cuf1</STRONG>, <STRONG>cuu1</STRONG>, and <STRONG>cud1</STRONG>.  These local
--       cursor  motions  should not alter the text they pass over,
--       for example, you would not normally use  `<STRONG>cuf1</STRONG>= '  because
-+       cursor motions should not alter the text they  pass  over,
-+       for  example,  you would not normally use `<STRONG>cuf1</STRONG>= ' because
-        the space would erase the character moved over.
- 
--       A  very  important  point  here  is  that the local cursor
--       motions encoded in <EM>terminfo</EM> are undefined at the left  and
--       top  edges  of  a  CRT  terminal.   Programs  should never
--       attempt to backspace around the left edge,  unless  <STRONG>bw</STRONG>  is
-+       A very important point  here  is  that  the  local  cursor
-+       motions  encoded in <EM>terminfo</EM> are undefined at the left and
-+       top edges  of  a  CRT  terminal.   Programs  should  never
-+       attempt  to  backspace  around the left edge, unless <STRONG>bw</STRONG> is
-        given, and never attempt to go up locally off the top.  In
--       order to scroll text up, a program will go to  the  bottom
-+       order  to  scroll text up, a program will go to the bottom
-        left corner of the screen and send the <STRONG>ind</STRONG> (index) string.
- 
-        To scroll text down, a program goes to the top left corner
--       of  the  screen  and  sends the <STRONG>ri</STRONG> (reverse index) string.
--       The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG> are undefined  when  not  on  their
-+       of the screen and sends the  <STRONG>ri</STRONG>  (reverse  index)  string.
-+       The  strings  <STRONG>ind</STRONG>  and  <STRONG>ri</STRONG> are undefined when not on their
-        respective corners of the screen.
- 
-        Parameterized versions of the scrolling sequences are <STRONG>indn</STRONG>
-        and <STRONG>rin</STRONG> which have the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except
--       that  they take one parameter, and scroll that many lines.
--       They are also undefined except at the appropriate edge  of
-+       that they take one parameter, and scroll that many  lines.
-+       They  are also undefined except at the appropriate edge of
-        the screen.
- 
--       The  <STRONG>am</STRONG>  capability tells whether the cursor sticks at the
--       right edge of the screen when text  is  output,  but  this
-+       The <STRONG>am</STRONG> capability tells whether the cursor sticks  at  the
-+       right  edge  of  the  screen when text is output, but this
-        does not necessarily apply to a <STRONG>cuf1</STRONG> from the last column.
--       The only local motion which is defined from the left  edge
--       is  if  <STRONG>bw</STRONG>  is  given, then a <STRONG>cub1</STRONG> from the left edge will
--       move to the right edge of the previous row.  If <STRONG>bw</STRONG> is  not
--       given,  the effect is undefined.  This is useful for draw-
--       ing a box around the edge of the screen, for example.   If
--       the  terminal has switch selectable automatic margins, the
--       <EM>terminfo</EM> file usually assumes that this is on;  i.e.,  <STRONG>am</STRONG>.
--       If  the  terminal  has  a command which moves to the first
--       column of the next line, that command can be given as  <STRONG>nel</STRONG>
--       (newline).   It  does not matter if the command clears the
--       remainder of the current line, so if the terminal  has  no
--       <STRONG>cr</STRONG>  and <STRONG>lf</STRONG> it may still be possible to craft a working <STRONG>nel</STRONG>
-+       The  only local motion which is defined from the left edge
-+       is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from  the  left  edge  will
-+       move  to the right edge of the previous row.  If <STRONG>bw</STRONG> is not
-+       given, the effect is undefined.  This is useful for  draw-
-+       ing  a box around the edge of the screen, for example.  If
-+       the terminal has switch selectable automatic margins,  the
-+       <EM>terminfo</EM>  file  usually assumes that this is on; i.e., <STRONG>am</STRONG>.
-+       If the terminal has a command which  moves  to  the  first
-+       column  of the next line, that command can be given as <STRONG>nel</STRONG>
-+       (newline).  It does not matter if the command  clears  the
-+       remainder  of  the current line, so if the terminal has no
-+       <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to craft a working  <STRONG>nel</STRONG>
-        out of one or both of them.
- 
-        These  capabilities  suffice  to  describe  hard-copy  and
--       "glass-tty"  terminals.   Thus  the  model  33 teletype is
-+       "glass-tty" terminals.  Thus  the  model  33  teletype  is
-        described as
- 
-        33|tty33|tty|model 33 teletype,
-@@ -1232,21 +1236,21 @@
- 
- 
-    <STRONG>Parameterized</STRONG> <STRONG>Strings</STRONG>
--       Cursor addressing and other strings  requiring  parameters
--       in  the  terminal  are described by a parameterized string
--       capability, with <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG> like escapes  <STRONG>%x</STRONG>  in  it.   For
--       example,  to  address  the  cursor,  the <STRONG>cup</STRONG> capability is
-+       Cursor  addressing  and other strings requiring parameters
-+       in the terminal are described by  a  parameterized  string
-+       capability,  with  <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>  like  escapes <STRONG>%x</STRONG> in it.  For
-+       example, to address the  cursor,  the  <STRONG>cup</STRONG>  capability  is
-        given, using two parameters: the row and column to address
-        to.  (Rows and columns are numbered from zero and refer to
-        the physical screen visible to the user, not to any unseen
--       memory.)   If  the  terminal  has  memory  relative cursor
-+       memory.)  If  the  terminal  has  memory  relative  cursor
-        addressing, that can be indicated by <STRONG>mrcup</STRONG>.
- 
--       The parameter mechanism uses a stack and special  <STRONG>%</STRONG>  codes
--       to  manipulate  it.  Typically a sequence will push one of
--       the parameters onto the stack and then print  it  in  some
--       format.   Print  (e.g.,  "%d")  is  a special case.  Other
--       operations, including "%t"  pop  their  operand  from  the
-+       The  parameter  mechanism uses a stack and special <STRONG>%</STRONG> codes
-+       to manipulate it.  Typically a sequence will push  one  of
-+       the  parameters  onto  the stack and then print it in some
-+       format.  Print (e.g., "%d")  is  a  special  case.   Other
-+       operations,  including  "%t"  pop  their  operand from the
-        stack.  It is noted that more complex operations are often
-        necessary, e.g., in the <STRONG>sgr</STRONG> string.
- 
-@@ -1256,8 +1260,8 @@
-        %%   outputs `%'
- 
-        %<EM>[[</EM>:<EM>]flags][width[.precision]][</EM>doxXs<EM>]</EM>
--            as in <STRONG>printf</STRONG>, flags are [-+#] and space.  Use  a  `:'
--            to  allow the next character to be a `-' flag, avoid-
-+            as  in  <STRONG>printf</STRONG>, flags are [-+#] and space.  Use a `:'
-+            to allow the next character to be a `-' flag,  avoid-
-             ing interpreting "%-" as an operator.
- 
-        %c   print pop() like %c in <STRONG>printf</STRONG>
-@@ -1279,11 +1283,11 @@
-        %g[A-Z]
-             get static variable [a-z] and push it
- 
--            The terms  "static"  and  "dynamic"  are  misleading.
--            Historically,  these are simply two different sets of
--            variables, whose values are not reset  between  calls
--            to  <STRONG>tparm</STRONG>.   However,  that fact is not documented in
--            other implementations.  Relying on it will  adversely
-+            The  terms  "static"  and  "dynamic"  are misleading.
-+            Historically, these are simply two different sets  of
-+            variables,  whose  values are not reset between calls
-+            to <STRONG>tparm</STRONG>.  However, that fact is  not  documented  in
-+            other  implementations.  Relying on it will adversely
-             impact portability to other implementations.
- 
-        %'<EM>c</EM>' char constant <EM>c</EM>
-@@ -1307,16 +1311,16 @@
-             logical AND and OR operations (for conditionals)
- 
-        %! %~
--            unary  operations  (logical  and   bit   complement):
-+            unary   operations   (logical  and  bit  complement):
-             push(op pop())
- 
-        %i   add 1 to first two parameters (for ANSI terminals)
- 
-        %? <EM>expr</EM> %t <EM>thenpart</EM> %e <EM>elsepart</EM> %;
--            This  forms  an  if-then-else.   The  %e  <EM>elsepart</EM> is
--            optional.  Usually the %? <EM>expr</EM> part  pushes  a  value
--            onto  the stack, and %t pops it from the stack, test-
--            ing if it is nonzero (true).  If it is zero  (false),
-+            This forms  an  if-then-else.   The  %e  <EM>elsepart</EM>  is
-+            optional.   Usually  the  %? <EM>expr</EM> part pushes a value
-+            onto the stack, and %t pops it from the stack,  test-
-+            ing  if it is nonzero (true).  If it is zero (false),
-             control passes to the %e (else) part.
- 
-             It is possible to form else-if's a la Algol 68:
-@@ -1325,282 +1329,282 @@
-             where ci are conditions, bi are bodies.
- 
-             Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the struc-
--            ture  of if-then-else's.  Some strings, e.g., <STRONG>sgr</STRONG> can
-+            ture of if-then-else's.  Some strings, e.g., <STRONG>sgr</STRONG>  can
-             be very complicated when written on one line.  The <STRONG>-f</STRONG>
--            option  splits  the  string into lines with the parts
-+            option splits the string into lines  with  the  parts
-             indented.
- 
-        Binary operations are in postfix form with the operands in
--       the  usual  order.   That  is,  to  get  x-5 one would use
--       "%gx%{5}%-".  %P and %g variables  are  persistent  across
-+       the usual order.  That  is,  to  get  x-5  one  would  use
-+       "%gx%{5}%-".   %P  and  %g variables are persistent across
-        escape-string evaluations.
- 
-        Consider the HP2645, which, to get to row 3 and column 12,
--       needs to be sent \E&amp;a12c03Y  padded  for  6  milliseconds.
--       Note  that  the  order of the rows and columns is inverted
--       here, and that the row and column are printed as two  dig-
-+       needs  to  be  sent  \E&amp;a12c03Y padded for 6 milliseconds.
-+       Note that the order of the rows and  columns  is  inverted
-+       here,  and that the row and column are printed as two dig-
-        its.  Thus its <STRONG>cup</STRONG> capability is "cup=6\E&amp;%p2%2dc%p1%2dY".
- 
-        The Microterm ACT-IV needs the current row and column sent
--       preceded  by  a <STRONG>^T</STRONG>, with the row and column simply encoded
--       in binary, "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"
--       need  to  be  able  to backspace the cursor (<STRONG>cub1</STRONG>), and to
-+       preceded by a <STRONG>^T</STRONG>, with the row and column  simply  encoded
-+       in  binary,  "cup=^T%p1%c%p2%c".  Terminals which use "%c"
-+       need to be able to backspace the  cursor  (<STRONG>cub1</STRONG>),  and  to
-        move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).  This is
--       necessary  because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG>
--       and <STRONG>\r</STRONG>, as the system may change or  discard  them.   (The
--       library  routines  dealing  with terminfo set tty modes so
-+       necessary because it is not always safe to transmit <STRONG>\n</STRONG>  <STRONG>^D</STRONG>
-+       and  <STRONG>\r</STRONG>,  as  the system may change or discard them.  (The
-+       library routines dealing with terminfo set  tty  modes  so
-        that tabs are never expanded, so \t is safe to send.  This
-        turns out to be essential for the Ann Arbor 4080.)
- 
-        A final example is the LSI ADM-3a, which uses row and col-
-        umn  offset  by  a  blank  character,  thus  "cup=\E=%p1%'
--       '%+%c%p2%'  '%+%c".   After sending `\E=', this pushes the
--       first parameter, pushes the ASCII value for a space  (32),
--       adds  them  (pushing  the sum on the stack in place of the
--       two previous values) and outputs that value as  a  charac-
--       ter.   Then  the  same  is  done for the second parameter.
-+       '%+%c%p2%' '%+%c".  After sending `\E=', this  pushes  the
-+       first  parameter, pushes the ASCII value for a space (32),
-+       adds them (pushing the sum on the stack in  place  of  the
-+       two  previous  values) and outputs that value as a charac-
-+       ter.  Then the same is  done  for  the  second  parameter.
-        More complex arithmetic is possible using the stack.
- 
- 
-    <STRONG>Cursor</STRONG> <STRONG>Motions</STRONG>
-        If the terminal has a fast way to home the cursor (to very
--       upper  left  corner  of  screen) then this can be given as
--       <STRONG>home</STRONG>; similarly a fast way of getting to the  lower  left-
--       hand  corner can be given as <STRONG>ll</STRONG>; this may involve going up
--       with <STRONG>cuu1</STRONG> from the home position,  but  a  program  should
--       never  do this itself (unless <STRONG>ll</STRONG> does) because it can make
--       no assumption about the effect of moving up from the  home
--       position.   Note  that  the  home  position is the same as
-+       upper left corner of screen) then this  can  be  given  as
-+       <STRONG>home</STRONG>;  similarly  a fast way of getting to the lower left-
-+       hand corner can be given as <STRONG>ll</STRONG>; this may involve going  up
-+       with  <STRONG>cuu1</STRONG>  from  the  home position, but a program should
-+       never do this itself (unless <STRONG>ll</STRONG> does) because it can  make
-+       no  assumption about the effect of moving up from the home
-+       position.  Note that the home  position  is  the  same  as
-        addressing to (0,0): to the top left corner of the screen,
--       not  of  memory.   (Thus, the \EH sequence on HP terminals
-+       not of memory.  (Thus, the \EH sequence  on  HP  terminals
-        cannot be used for <STRONG>home</STRONG>.)
- 
-        If the terminal has row or column absolute cursor address-
--       ing,  these  can be given as single parameter capabilities
-+       ing, these can be given as single  parameter  capabilities
-        <STRONG>hpa</STRONG> (horizontal position absolute) and <STRONG>vpa</STRONG> (vertical posi-
-        tion absolute).  Sometimes these are shorter than the more
--       general two parameter sequence (as with  the  hp2645)  and
--       can   be   used  in  preference  to  <STRONG>cup</STRONG>.   If  there  are
--       parameterized local motions (e.g., move <EM>n</EM>  spaces  to  the
--       right) these can be given as <STRONG>cud</STRONG>, <STRONG>cub</STRONG>, <STRONG>cuf</STRONG>, and <STRONG>cuu</STRONG> with a
--       single parameter  indicating  how  many  spaces  to  move.
--       These  are  primarily useful if the terminal does not have
--       <STRONG>cup</STRONG>, such as the TEKTRONIX 4025.
-+       general  two  parameter  sequence (as with the hp2645) and
-+       can be used in preference to <STRONG>cup</STRONG>.  If there are parameter-
-+       ized  local  motions  (e.g.,  move  <EM>n</EM> spaces to the right)
-+       these can be given as <STRONG>cud</STRONG>, <STRONG>cub</STRONG>, <STRONG>cuf</STRONG>, and <STRONG>cuu</STRONG> with a single
-+       parameter  indicating  how many spaces to move.  These are
-+       primarily useful if the terminal does not have  <STRONG>cup</STRONG>,  such
-+       as the TEKTRONIX 4025.
- 
-        If the terminal needs to be in a special mode when running
-        a program that uses these capabilities, the codes to enter
--       and exit this mode can be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.   This
--       arises,  for example, from terminals like the Concept with
--       more than one page of memory.  If the  terminal  has  only
--       memory  relative cursor addressing and not screen relative
-+       and  exit this mode can be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  This
-+       arises, for example, from terminals like the Concept  with
-+       more  than  one  page of memory.  If the terminal has only
-+       memory relative cursor addressing and not screen  relative
-        cursor addressing, a one screen-sized window must be fixed
--       into  the terminal for cursor addressing to work properly.
-+       into the terminal for cursor addressing to work  properly.
-        This is also used for the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets
--       the  command character to be the one used by terminfo.  If
--       the <STRONG>smcup</STRONG> sequence will not restore the  screen  after  an
-+       the command character to be the one used by terminfo.   If
-+       the  <STRONG>smcup</STRONG>  sequence  will not restore the screen after an
-        <STRONG>rmcup</STRONG> sequence is output (to the state prior to outputting
-        <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>.
- 
- 
-    <STRONG>Area</STRONG> <STRONG>Clears</STRONG>
-        If the terminal can clear from the current position to the
--       end  of  the  line,  leaving  the cursor where it is, this
-+       end of the line, leaving the  cursor  where  it  is,  this
-        should be given as <STRONG>el</STRONG>.  If the terminal can clear from the
--       beginning  of  the line to the current position inclusive,
--       leaving the cursor where it is, this should  be  given  as
--       <STRONG>el1</STRONG>.   If the terminal can clear from the current position
--       to the end of the display, then this should  be  given  as
--       <STRONG>ed</STRONG>.   <STRONG>Ed</STRONG>  is only defined from the first column of a line.
--       (Thus, it can be simulated by a request to delete a  large
-+       beginning of the line to the current  position  inclusive,
-+       leaving  the  cursor  where it is, this should be given as
-+       <STRONG>el1</STRONG>.  If the terminal can clear from the current  position
-+       to  the  end  of the display, then this should be given as
-+       <STRONG>ed</STRONG>.  <STRONG>Ed</STRONG> is only defined from the first column of  a  line.
-+       (Thus,  it can be simulated by a request to delete a large
-        number of lines, if a true <STRONG>ed</STRONG> is not available.)
- 
- 
-    <STRONG>Insert/delete</STRONG> <STRONG>line</STRONG> <STRONG>and</STRONG> <STRONG>vertical</STRONG> <STRONG>motions</STRONG>
--       If  the terminal can open a new blank line before the line
--       where the cursor is, this should be given as <STRONG>il1</STRONG>; this  is
--       done  only  from the first position of a line.  The cursor
-+       If the terminal can open a new blank line before the  line
-+       where  the cursor is, this should be given as <STRONG>il1</STRONG>; this is
-+       done only from the first position of a line.   The  cursor
-        must then appear on the newly blank line.  If the terminal
--       can  delete  the  line  which  the cursor is on, then this
--       should be given as <STRONG>dl1</STRONG>; this is done only from  the  first
--       position  on  the line to be deleted.  Versions of <STRONG>il1</STRONG> and
--       <STRONG>dl1</STRONG> which take a single parameter  and  insert  or  delete
-+       can delete the line which the  cursor  is  on,  then  this
-+       should  be  given as <STRONG>dl1</STRONG>; this is done only from the first
-+       position on the line to be deleted.  Versions of  <STRONG>il1</STRONG>  and
-+       <STRONG>dl1</STRONG>  which  take  a  single parameter and insert or delete
-        that many lines can be given as <STRONG>il</STRONG> and <STRONG>dl</STRONG>.
- 
--       If  the terminal has a settable scrolling region (like the
--       vt100) the command to set this can be described  with  the
--       <STRONG>csr</STRONG>  capability,  which  takes two parameters: the top and
-+       If the terminal has a settable scrolling region (like  the
-+       vt100)  the  command to set this can be described with the
-+       <STRONG>csr</STRONG> capability, which takes two parameters:  the  top  and
-        bottom lines of the scrolling region.  The cursor position
-        is, alas, undefined after using this command.
- 
--       It  is possible to get the effect of insert or delete line
-+       It is possible to get the effect of insert or delete  line
-        using <STRONG>csr</STRONG> on a properly chosen region; the <STRONG>sc</STRONG> and <STRONG>rc</STRONG> (save
--       and  restore  cursor)  commands may be useful for ensuring
--       that your synthesized insert/delete string does  not  move
--       the  cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library does this
--       synthesis  automatically,  so   you   need   not   compose
-+       and restore cursor) commands may be  useful  for  ensuring
-+       that  your  synthesized insert/delete string does not move
-+       the cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library does  this
-+       synthesis   automatically,   so   you   need  not  compose
-        insert/delete strings for an entry with <STRONG>csr</STRONG>).
- 
-        Yet another way to construct insert and delete might be to
--       use a combination of index with  the  memory-lock  feature
--       found  on some terminals (like the HP-700/90 series, which
-+       use  a  combination  of index with the memory-lock feature
-+       found on some terminals (like the HP-700/90 series,  which
-        however also has insert/delete).
- 
--       Inserting lines at the top or bottom  of  the  screen  can
--       also  be  done using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a
--       true insert/delete line, and is often faster even on  ter-
-+       Inserting  lines  at  the  top or bottom of the screen can
-+       also be done using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals  without  a
-+       true  insert/delete line, and is often faster even on ter-
-        minals with those features.
- 
--       The  boolean  <STRONG>non_dest_scroll_region</STRONG> should be set if each
--       scrolling window is effectively a view port on  a  screen-
--       sized  canvas.   To  test  for  this  capability, create a
--       scrolling region in the middle of the screen, write  some-
--       thing  to  the  bottom line, move the cursor to the top of
-+       The boolean <STRONG>non_dest_scroll_region</STRONG> should be set  if  each
-+       scrolling  window  is effectively a view port on a screen-
-+       sized canvas.  To  test  for  this  capability,  create  a
-+       scrolling  region in the middle of the screen, write some-
-+       thing to the bottom line, move the cursor to  the  top  of
-        the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data
--       scrolled  off  the  bottom  of  the  region  by the <STRONG>ri</STRONG> re-
--       appears, then scrolling is non-destructive.  System V  and
--       XSI  Curses  expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>, and <STRONG>rin</STRONG> will simu-
--       late destructive scrolling; their  documentation  cautions
--       you  not  to  define <STRONG>csr</STRONG> unless this is true.  This <STRONG>curses</STRONG>
-+       scrolled off the bottom  of  the  region  by  the  <STRONG>ri</STRONG>  re-
-+       appears,  then scrolling is non-destructive.  System V and
-+       XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>, and <STRONG>rin</STRONG>  will  simu-
-+       late  destructive  scrolling; their documentation cautions
-+       you not to define <STRONG>csr</STRONG> unless this is  true.   This  <STRONG>curses</STRONG>
-        implementation is more liberal and will do explicit erases
-        after scrolling if <STRONG>ndstr</STRONG> is defined.
- 
-        If the terminal has the ability to define a window as part
--       of memory, which all commands affect, it should  be  given
-+       of  memory,  which all commands affect, it should be given
-        as the parameterized string <STRONG>wind</STRONG>.  The four parameters are
--       the starting and ending lines in memory and  the  starting
-+       the  starting  and ending lines in memory and the starting
-        and ending columns in memory, in that order.
- 
--       If  the terminal can retain display memory above, then the
--       <STRONG>da</STRONG> capability should be given; if display  memory  can  be
--       retained  below,  then <STRONG>db</STRONG> should be given.  These indicate
--       that deleting a line  or  scrolling  may  bring  non-blank
--       lines  up  from  below  or that scrolling back with <STRONG>ri</STRONG> may
-+       If the terminal can retain display memory above, then  the
-+       <STRONG>da</STRONG>  capability  should  be given; if display memory can be
-+       retained below, then <STRONG>db</STRONG> should be given.   These  indicate
-+       that  deleting  a  line  or  scrolling may bring non-blank
-+       lines up from below or that scrolling  back  with  <STRONG>ri</STRONG>  may
-        bring down non-blank lines.
- 
- 
-    <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG>
--       There are two basic kinds of  intelligent  terminals  with
--       respect  to insert/delete character which can be described
--       using <EM>terminfo.</EM>  The most common  insert/delete  character
--       operations  affect only the characters on the current line
--       and shift characters off the  end  of  the  line  rigidly.
--       Other  terminals,  such  as the Concept 100 and the Perkin
--       Elmer Owl, make 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.  You can
--       determine the kind of terminal you have  by  clearing  the
--       screen  and  then typing text separated by cursor motions.
--       Type "abc    def" using local cursor motions (not  spaces)
-+       There  are  two  basic kinds of intelligent terminals with
-+       respect to insert/delete character which can be  described
-+       using  <EM>terminfo.</EM>   The most common insert/delete character
-+       operations affect only the characters on the current  line
-+       and  shift  characters  off  the  end of the line rigidly.
-+       Other terminals, such as the Concept 100  and  the  Perkin
-+       Elmer  Owl,  make  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.   You  can
-+       determine  the  kind  of terminal you have by clearing the
-+       screen and then typing text separated by  cursor  motions.
-+       Type  "abc    def" using local cursor motions (not spaces)
-        between the "abc" and the "def".  Then position the cursor
--       before the "abc" and put the terminal in insert mode.   If
--       typing  characters  causes  the  rest of the line to shift
-+       before  the "abc" and put the terminal in insert mode.  If
-+       typing characters causes the rest of  the  line  to  shift
-        rigidly and characters to fall off the end, then your ter-
--       minal  does  not  distinguish  between  blanks and untyped
--       positions.  If the "abc" shifts over to  the  "def"  which
--       then  move together around the end of the current line and
--       onto the next as you insert, you have the second  type  of
--       terminal,  and should give the capability <STRONG>in</STRONG>, which stands
-+       minal does not  distinguish  between  blanks  and  untyped
-+       positions.   If  the  "abc" shifts over to the "def" which
-+       then move together around the end of the current line  and
-+       onto  the  next as you insert, you have the second type of
-+       terminal, and should give the capability <STRONG>in</STRONG>, which  stands
-        for "insert null".  While these are two logically separate
--       attributes  (one  line  versus multi-line insert mode, and
--       special treatment of untyped spaces) we have seen no  ter-
-+       attributes (one line versus multi-line  insert  mode,  and
-+       special  treatment of untyped spaces) we have seen no ter-
-        minals whose insert mode cannot be described with the sin-
-        gle attribute.
- 
--       Terminfo can describe both terminals which have an  insert
-+       Terminfo  can describe both terminals which have an insert
-        mode, and terminals which send a simple sequence to open a
--       blank position on the current  line.   Give  as  <STRONG>smir</STRONG>  the
--       sequence  to  get  into  insert  mode.   Give  as <STRONG>rmir</STRONG> the
--       sequence to leave insert  mode.   Now  give  as  <STRONG>ich1</STRONG>  any
-+       blank  position  on  the  current  line.  Give as <STRONG>smir</STRONG> the
-+       sequence to get  into  insert  mode.   Give  as  <STRONG>rmir</STRONG>  the
-+       sequence  to  leave  insert  mode.   Now  give as <STRONG>ich1</STRONG> any
-        sequence  needed  to  be  sent  just  before  sending  the
--       character to be inserted.   Most  terminals  with  a  true
--       insert  mode  will  not  give <STRONG>ich1</STRONG>; terminals which send a
-+       character  to  be  inserted.   Most  terminals with a true
-+       insert mode will not give <STRONG>ich1</STRONG>;  terminals  which  send  a
-        sequence to open a screen position should give it here.
- 
--       If your terminal has both, insert mode is usually  prefer-
--       able  to  <STRONG>ich1</STRONG>.   Technically,  you  should  not give both
--       unless the terminal actually requires both to be  used  in
--       combination.   Accordingly,  some  non-curses applications
--       get confused if both are present; the symptom  is  doubled
-+       If  your terminal has both, insert mode is usually prefer-
-+       able to <STRONG>ich1</STRONG>.   Technically,  you  should  not  give  both
-+       unless  the  terminal actually requires both to be used in
-+       combination.  Accordingly,  some  non-curses  applications
-+       get  confused  if both are present; the symptom is doubled
-        characters in an update using insert.  This requirement is
-        now rare; most <STRONG>ich</STRONG> sequences do not require previous smir,
-        and most smir insert modes do not require <STRONG>ich1</STRONG> before each
--       character.  Therefore, the  new  <STRONG>curses</STRONG>  actually  assumes
--       this  is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> as
-+       character.   Therefore,  the  new  <STRONG>curses</STRONG> actually assumes
-+       this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or <STRONG>ich</STRONG>/<STRONG>ich1</STRONG>  as
-        appropriate (but not both).  If you have to write an entry
--       to  be  used under new curses for a terminal old enough to
-+       to be used under new curses for a terminal old  enough  to
-        need both, include the <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>.
- 
-        If post insert padding is needed, give this as a number of
--       milliseconds  in <STRONG>ip</STRONG> (a string option).  Any other sequence
--       which may need to be sent after  an  insert  of  a  single
-+       milliseconds in <STRONG>ip</STRONG> (a string option).  Any other  sequence
-+       which  may  need  to  be  sent after an insert of a single
-        character may also be given in <STRONG>ip</STRONG>.  If your terminal needs
-        both to be placed into an `insert mode' and a special code
--       to  precede  each  inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>
--       and <STRONG>ich1</STRONG> can be given, and both will  be  used.   The  <STRONG>ich</STRONG>
-+       to precede each inserted character,  then  both  <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>
-+       and  <STRONG>ich1</STRONG>  can  be  given, and both will be used.  The <STRONG>ich</STRONG>
-        capability, with one parameter, <EM>n</EM>, will repeat the effects
-        of <STRONG>ich1</STRONG> <EM>n</EM> times.
- 
-        If padding is necessary between characters typed while not
--       in  insert  mode,  give  this  as a number of milliseconds
-+       in insert mode, give this  as  a  number  of  milliseconds
-        padding in <STRONG>rmp</STRONG>.
- 
--       It is occasionally  necessary  to  move  around  while  in
--       insert  mode  to delete characters on the same line (e.g.,
--       if there is a tab after the insertion position).  If  your
--       terminal  allows  motion while in insert mode you can give
--       the capability <STRONG>mir</STRONG> to speed up  inserting  in  this  case.
--       Omitting  <STRONG>mir</STRONG>  will  affect  only  speed.   Some terminals
-+       It  is  occasionally  necessary  to  move  around while in
-+       insert mode to delete characters on the same  line  (e.g.,
-+       if  there is a tab after the insertion position).  If your
-+       terminal allows motion while in insert mode you  can  give
-+       the  capability  <STRONG>mir</STRONG>  to  speed up inserting in this case.
-+       Omitting <STRONG>mir</STRONG>  will  affect  only  speed.   Some  terminals
-        (notably Datamedia's) must not have <STRONG>mir</STRONG> because of the way
-        their insert mode works.
- 
--       Finally,  you  can specify <STRONG>dch1</STRONG> to delete a single charac-
--       ter, <STRONG>dch</STRONG> with one parameter, <EM>n</EM>, to  delete  <EM>n</EM>  <EM>characters,</EM>
--       and  delete mode by giving <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit
--       delete mode (any mode the terminal needs to be  placed  in
-+       Finally, you can specify <STRONG>dch1</STRONG> to delete a  single  charac-
-+       ter,  <STRONG>dch</STRONG>  with  one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM>
-+       and delete mode by giving <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and  exit
-+       delete  mode  (any mode the terminal needs to be placed in
-        for <STRONG>dch1</STRONG> to work).
- 
--       A  command to erase <EM>n</EM> characters (equivalent to outputting
--       <EM>n</EM> blanks without moving the cursor) can be  given  as  <STRONG>ech</STRONG>
-+       A command to erase <EM>n</EM> characters (equivalent to  outputting
-+       <EM>n</EM>  blanks  without  moving the cursor) can be given as <STRONG>ech</STRONG>
-        with one parameter.
- 
- 
-    <STRONG>Highlighting,</STRONG> <STRONG>Underlining,</STRONG> <STRONG>and</STRONG> <STRONG>Visible</STRONG> <STRONG>Bells</STRONG>
-        If  your  terminal  has  one  or  more  kinds  of  display
--       attributes, these can be represented in a number  of  dif-
-+       attributes,  these  can be represented in a number of dif-
-        ferent ways.  You should choose one display form as <EM>stand-</EM>
-        <EM>out</EM> <EM>mode</EM>, representing a good, high contrast, easy-on-the-
--       eyes,  format  for  highlighting  error messages and other
--       attention getters.  (If you have a choice,  reverse  video
--       plus  half-bright  is  good, or reverse video alone.)  The
--       sequences to enter and exit standout  mode  are  given  as
--       <STRONG>smso</STRONG>  and  <STRONG>rmso</STRONG>, respectively.  If the code to change into
--       or out of standout mode  leaves  one  or  even  two  blank
--       spaces  on the screen, as the TVI 912 and Teleray 1061 do,
-+       eyes, format for highlighting  error  messages  and  other
-+       attention  getters.   (If you have a choice, reverse video
-+       plus half-bright is good, or reverse  video  alone.)   The
-+       sequences  to  enter  and  exit standout mode are given as
-+       <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, respectively.  If the code to  change  into
-+       or  out  of  standout  mode  leaves  one or even two blank
-+       spaces on the screen, as the TVI 912 and Teleray 1061  do,
-        then <STRONG>xmc</STRONG> should be given to tell how many spaces are left.
- 
--       Codes  to  begin  underlining  and  end underlining can be
--       given as <STRONG>smul</STRONG> and <STRONG>rmul</STRONG> respectively.  If the terminal  has
--       a  code  to  underline  the current character and move the
-+       Codes to begin underlining  and  end  underlining  can  be
-+       given  as <STRONG>smul</STRONG> and <STRONG>rmul</STRONG> respectively.  If the terminal has
-+       a code to underline the current  character  and  move  the
-        cursor one space to the right, such as the Microterm Mime,
-        this can be given as <STRONG>uc</STRONG>.
- 
--       Other  capabilities  to  enter  various highlighting modes
--       include <STRONG>blink</STRONG> (blinking) <STRONG>bold</STRONG> (bold or extra  bright)  <STRONG>dim</STRONG>
--       (dim  or  half-bright)  <STRONG>invis</STRONG> (blanking or invisible text)
--       <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG>  (turn  off  <EM>all</EM>
--       attribute  modes)  <STRONG>smacs</STRONG>  (enter  alternate  character set
--       mode) and  <STRONG>rmacs</STRONG>  (exit  alternate  character  set  mode).
--       Turning  on  any of these modes singly may or may not turn
-+       Other capabilities to  enter  various  highlighting  modes
-+       include  <STRONG>blink</STRONG>  (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG>
-+       (dim or half-bright) <STRONG>invis</STRONG> (blanking  or  invisible  text)
-+       <STRONG>prot</STRONG>  (protected)  <STRONG>rev</STRONG>  (reverse video) <STRONG>sgr0</STRONG> (turn off <EM>all</EM>
-+       attribute modes)  <STRONG>smacs</STRONG>  (enter  alternate  character  set
-+       mode)  and  <STRONG>rmacs</STRONG>  (exit  alternate  character  set mode).
-+       Turning on any of these modes singly may or may  not  turn
-        off other modes.
- 
--       If there is a sequence to set  arbitrary  combinations  of
--       modes,  this should be given as <STRONG>sgr</STRONG> (set attributes), tak-
--       ing 9 parameters.  Each parameter is either 0 or  nonzero,
-+       If  there  is  a sequence to set arbitrary combinations of
-+       modes, this should be given as <STRONG>sgr</STRONG> (set attributes),  tak-
-+       ing  9 parameters.  Each parameter is either 0 or nonzero,
-        as the corresponding attribute is on or off.  The 9 param-
--       eters are, in order: standout, underline, reverse,  blink,
--       dim,  bold,  blank, protect, alternate character set.  Not
--       all modes need be supported by <STRONG>sgr</STRONG>, only those  for  which
-+       eters  are, in order: standout, underline, reverse, blink,
-+       dim, bold, blank, protect, alternate character  set.   Not
-+       all  modes  need be supported by <STRONG>sgr</STRONG>, only those for which
-        corresponding separate attribute commands exist.
- 
-        For example, the DEC vt220 supports most of the modes:
-@@ -1619,22 +1623,22 @@
-             p8                protect      not used
-             p9                altcharset   ^O (off) ^N (on)
- 
--       We  begin each escape sequence by turning off any existing
--       modes, since there is no quick way  to  determine  whether
-+       We begin each escape sequence by turning off any  existing
-+       modes,  since  there  is no quick way to determine whether
-        they are active.  Standout is set up to be the combination
--       of reverse and bold.  The vt220  terminal  has  a  protect
--       mode,  though  it  is  not commonly used in sgr because it
--       protects characters on the screen  from  the  host's  era-
--       sures.   The  altcharset mode also is different in that it
--       is either ^O or ^N, depending on whether it is off or  on.
--       If  all  modes  are  turned  on, the resulting sequence is
-+       of  reverse  and  bold.   The vt220 terminal has a protect
-+       mode, though it is not commonly used  in  sgr  because  it
-+       protects  characters  on  the  screen from the host's era-
-+       sures.  The altcharset mode also is different in  that  it
-+       is  either ^O or ^N, depending on whether it is off or on.
-+       If all modes are turned  on,  the  resulting  sequence  is
-        \E[0;1;4;5;7;8m^N.
- 
--       Some sequences are common to different modes.   For  exam-
--       ple,  ;7  is output when either p1 or p3 is true, that is,
-+       Some  sequences  are common to different modes.  For exam-
-+       ple, ;7 is output when either p1 or p3 is true,  that  is,
-        if either standout or reverse modes are turned on.
- 
--       Writing out the above sequences, along with  their  depen-
-+       Writing  out  the above sequences, along with their depen-
-        dencies yields
- 
- 
-@@ -1644,9 +1648,9 @@
-           ;1         if p1 or p6         %?%p1%p6%|%t;1%;
-           ;4         if p2               %?%p2%|%t;4%;
-           ;5         if p4               %?%p4%|%t;5%;
--
-           ;7         if p1 or p3         %?%p1%p3%|%t;7%;
-           ;8         if p7               %?%p7%|%t;8%;
-+
-           m          always              m
-           ^N or ^O   if p9 ^N, else ^O   %?%p9%t^N%e^O%;
- 
-@@ -1655,76 +1659,75 @@
-            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%;,
- 
--       Remember  that  if  you specify sgr, you must also specify
--       sgr0.  Also, some implementations rely on sgr being  given
--       if  sgr0  is, Not all terminfo entries necessarily have an
--       sgr string, however.  Many terminfo  entries  are  derived
--       from  termcap  entries which have no sgr string.  The only
--       drawback to adding an sgr  string  is  that  termcap  also
--       assumes  that  sgr0  does not exit alternate character set
-+       Remember that if you specify sgr, you  must  also  specify
-+       sgr0.   Also, some implementations rely on sgr being given
-+       if sgr0 is, Not all terminfo entries necessarily  have  an
-+       sgr  string,  however.   Many terminfo entries are derived
-+       from termcap entries which have no sgr string.   The  only
-+       drawback  to  adding  an  sgr  string is that termcap also
-+       assumes that sgr0 does not exit  alternate  character  set
-        mode.
- 
--       Terminals with the ``magic cookie'' glitch  (<STRONG>xmc</STRONG>)  deposit
--       special   ``cookies''   when   they  receive  mode-setting
--       sequences, which affect the display algorithm rather  than
--       having  extra  bits  for  each character.  Some terminals,
--       such as the HP 2621,  automatically  leave  standout  mode
--       when  they  move to a new line or the cursor is addressed.
--       Programs using standout mode  should  exit  standout  mode
--       before  moving the cursor or sending a newline, unless the
--       <STRONG>msgr</STRONG> capability, asserting that it  is  safe  to  move  in
-+       Terminals  with  the ``magic cookie'' glitch (<STRONG>xmc</STRONG>) deposit
-+       special  ``cookies''  when   they   receive   mode-setting
-+       sequences,  which affect the display algorithm rather than
-+       having extra bits for  each  character.   Some  terminals,
-+       such  as  the  HP  2621, automatically leave standout mode
-+       when they move to a new line or the cursor  is  addressed.
-+       Programs  using  standout  mode  should exit standout mode
-+       before moving the cursor or sending a newline, unless  the
-+       <STRONG>msgr</STRONG>  capability,  asserting  that  it  is safe to move in
-        standout mode, is present.
- 
--       If  the terminal has a way of flashing the screen to indi-
--       cate an error quietly (a bell replacement) then  this  can
-+       If the terminal has a way of flashing the screen to  indi-
-+       cate  an  error quietly (a bell replacement) then this can
-        be given as <STRONG>flash</STRONG>; it must not move the cursor.
- 
--       If  the  cursor  needs to be made more visible than normal
-+       If the cursor needs to be made more  visible  than  normal
-        when it is not on the bottom line (to make, for example, a
--       non-blinking  underline  into  an  easier to find block or
-+       non-blinking underline into an easier  to  find  block  or
-        blinking underline) give this sequence as <STRONG>cvvis</STRONG>.  If there
--       is  a  way  to  make the cursor completely invisible, give
-+       is a way to make the  cursor  completely  invisible,  give
-        that as <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> should be given which
-        undoes the effects of both of these modes.
- 
-        If your terminal correctly generates underlined characters
--       (with no special codes needed) even  though  it  does  not
--       overstrike,  then you should give the capability <STRONG>ul</STRONG>.  If a
--       character overstriking another leaves both  characters  on
-+       (with  no  special  codes  needed) even though it does not
-+       overstrike, then you should give the capability <STRONG>ul</STRONG>.  If  a
-+       character  overstriking  another leaves both characters on
-        the screen, specify the capability <STRONG>os</STRONG>.  If overstrikes are
--       erasable with a blank, then this should  be  indicated  by
-+       erasable  with  a  blank, then this should be indicated by
-        giving <STRONG>eo</STRONG>.
- 
- 
-    <STRONG>Keypad</STRONG> <STRONG>and</STRONG> <STRONG>Function</STRONG> <STRONG>Keys</STRONG>
-        If the terminal has a keypad that transmits codes when the
--       keys are pressed, this information  can  be  given.   Note
-+       keys  are  pressed,  this  information can be given.  Note
-        that it is not possible to handle terminals where the key-
-        pad only works in local (this applies, for example, to the
--       unshifted  HP  2621  keys).   If  the keypad can be set to
--       transmit or not transmit, give these  codes  as  <STRONG>smkx</STRONG>  and
-+       unshifted HP 2621 keys).  If the  keypad  can  be  set  to
-+       transmit  or  not  transmit,  give these codes as <STRONG>smkx</STRONG> and
-        <STRONG>rmkx</STRONG>.  Otherwise the keypad is assumed to always transmit.
--       The codes sent by the left arrow, right arrow,  up  arrow,
--       down  arrow,  and  home keys can be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG>
--       <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG> respectively.  If there are  func-
--       tion  keys  such  as f0, f1, ..., f10, the codes they send
--       can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these  keys  have
--       labels  other  than the default f0 through f10, the labels
--       can  be  given  as  <STRONG>lf0,</STRONG>  <STRONG>lf1,</STRONG>  <STRONG>...,</STRONG>  <STRONG>lf10</STRONG>.    The   codes
--       transmitted  by  certain  other special keys can be given:
--       <STRONG>kll</STRONG> (home down), <STRONG>kbs</STRONG> (backspace), <STRONG>ktbc</STRONG> (clear  all  tabs),
--       <STRONG>kctab</STRONG>  (clear  the  tab  stop in this column), <STRONG>kclr</STRONG> (clear
--       screen or  erase  key),  <STRONG>kdch1</STRONG>  (delete  character),  <STRONG>kdl1</STRONG>
--       (delete line), <STRONG>krmir</STRONG> (exit insert mode), <STRONG>kel</STRONG> (clear to end
--       of line), <STRONG>ked</STRONG> (clear to  end  of  screen),  <STRONG>kich1</STRONG>  (insert
--       character  or  enter insert mode), <STRONG>kil1</STRONG> (insert line), <STRONG>knp</STRONG>
--       (next  page),  <STRONG>kpp</STRONG>  (previous  page),  <STRONG>kind</STRONG>  (scroll  for-
--       ward/down), <STRONG>kri</STRONG> (scroll backward/up), <STRONG>khts</STRONG> (set a tab stop
--       in this column).  In addition, if the keypad has a 3 by  3
--       array  of  keys  including  the four arrow keys, the other
--       five keys can be given as <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,  <STRONG>kc1</STRONG>,  and  <STRONG>kc3</STRONG>.
--       These  keys are useful when the effects of a 3 by 3 direc-
--       tional pad are needed.
-+       The  codes  sent by the left arrow, right arrow, up arrow,
-+       down arrow, and home keys can be given  as  <STRONG>kcub1,</STRONG>  <STRONG>kcuf1,</STRONG>
-+       <STRONG>kcuu1,</STRONG>  <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG> respectively.  If there are func-
-+       tion keys such as f0, f1, ..., f10, the  codes  they  send
-+       can  be  given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these keys have
-+       labels other than the default f0 through f10,  the  labels
-+       can  be given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>.  The codes transmit-
-+       ted by certain other special keys can be given: <STRONG>kll</STRONG>  (home
-+       down),  <STRONG>kbs</STRONG>  (backspace),  <STRONG>ktbc</STRONG>  (clear  all  tabs), <STRONG>kctab</STRONG>
-+       (clear the tab stop in this column), <STRONG>kclr</STRONG> (clear screen or
-+       erase  key), <STRONG>kdch1</STRONG> (delete character), <STRONG>kdl1</STRONG> (delete line),
-+       <STRONG>krmir</STRONG> (exit insert mode), <STRONG>kel</STRONG> (clear to end of line),  <STRONG>ked</STRONG>
-+       (clear to end of screen), <STRONG>kich1</STRONG> (insert character or enter
-+       insert mode), <STRONG>kil1</STRONG> (insert line),  <STRONG>knp</STRONG>  (next  page),  <STRONG>kpp</STRONG>
-+       (previous  page),  <STRONG>kind</STRONG> (scroll forward/down), <STRONG>kri</STRONG> (scroll
-+       backward/up), <STRONG>khts</STRONG> (set a tab stop in  this  column).   In
-+       addition, if the keypad has a 3 by 3 array of keys includ-
-+       ing the four arrow keys, the other five keys can be  given
-+       as  <STRONG>ka1</STRONG>,  <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,  <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>.  These keys are useful
-+       when the effects of a 3 by 3 directional pad are needed.
- 
-        Strings to program function keys can be  given  as  <STRONG>pfkey</STRONG>,
-        <STRONG>pfloc</STRONG>,  and <STRONG>pfx</STRONG>.  A string to program screen labels should
-@@ -1914,7 +1917,6 @@
-        lantern symbol             ACS_LANTERN    #          i
-        large plus or crossover    ACS_PLUS       +          n
-        less-than-or-equal-to      ACS_LEQUAL     &lt;          y
--
-        lower left corner          ACS_LLCORNER   +          m
-        lower right corner         ACS_LRCORNER   +          j
-        not-equal                  ACS_NEQUAL     !          |
-@@ -1926,6 +1928,7 @@
-        solid square block         ACS_BLOCK      #          0
-        tee pointing down          ACS_TTEE       +          w
-        tee pointing left          ACS_RTEE       +          u
-+
-        tee pointing right         ACS_LTEE       +          t
-        tee pointing up            ACS_BTEE       +          v
-        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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.47 2010/12/04 18:38:55 tom Exp @
-+  * @Id: tic.1m,v 1.53 2011/12/17 23:13:19 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -52,84 +52,124 @@
- 
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
--       <STRONG>tic</STRONG>  [<STRONG>-1CGILNTUVacfgrstx</STRONG>]  [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-R</STRONG> <EM>subset</EM>]
--       [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM>
-+       <STRONG>tic</STRONG>  [<STRONG>-01CDGIKLNTUVacfgrstx</STRONG>]  [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-R</STRONG> <EM>sub-</EM>
-+       <EM>set</EM>] [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM>
- 
- 
- </PRE>
- <H2>DESCRIPTION</H2><PRE>
--       The command <STRONG>tic</STRONG> translates a  <STRONG>terminfo</STRONG>  file  from  source
-+       The <STRONG>tic</STRONG> command translates a  <STRONG>terminfo</STRONG>  file  from  source
-        format  into compiled format.  The compiled format is nec-
-        essary for use with the library routines in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
- 
--       The results are normally placed  in  the  system  terminfo
--       directory  <STRONG>/usr/share/terminfo</STRONG>.   There  are  two  ways to
--       change this behavior.
--
--       First, you may override the system default by setting  the
--       variable  <STRONG>TERMINFO</STRONG>  in  your  shell environment to a valid
--       (existing) directory name.
--
--       Secondly, if <STRONG>tic</STRONG> cannot get access to  <EM>/usr/share/terminfo</EM>
--       or  your  TERMINFO  directory,  it looks for the directory
--       <EM>$HOME/.terminfo</EM>; if that directory exists,  the  entry  is
--       placed there.
-+       As described in <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, the  database  may  be  either  a
-+       directory  tree  (one file per terminal entry) or a hashed
-+       database (one record per entry).  The <STRONG>tic</STRONG> writes only  one
-+       type of entry, depending on how it was built:
-+
-+       <STRONG>o</STRONG>   For  directory  trees,  the top-level directory, e.g.,
-+           /usr/share/terminfo, specifies  the  location  of  the
-+           database.
-+
-+       <STRONG>o</STRONG>   For  hashed  databases,  a filename is needed.  If the
-+           given file is not found by that name, but can be found
-+           by adding the suffix ".db", then that is used.
-+
-+           The  default  name for the hashed database is the same
-+           as the default directory name  (only  adding  a  ".db"
-+           suffix).
-+
-+       The  results  are  normally  placed in the system terminfo
-+       database  <STRONG>/usr/share/terminfo</STRONG>.   The   compiled   terminal
-+       description   can   be  placed  in  a  different  terminfo
-+       database.  There are two ways to achieve this:
-+
-+       <STRONG>o</STRONG>   First, you may override the system default by  setting
-+           the  variable  <STRONG>TERMINFO</STRONG> in your shell environment to a
-+           valid database location, e.g., an  existing  directory
-+           (for  directory  trees) or valid location for a hashed
-+           database.
-+
-+       <STRONG>o</STRONG>   Secondly, if <STRONG>tic</STRONG> cannot write  in  <EM>/usr/share/terminfo</EM>
-+           or  the  location  specified using your TERMINFO vari-
-+           able, it looks for the directory  <EM>$HOME/.terminfo</EM>  (or
-+           hashed  database <EM>$HOME/.terminfo.db)</EM>; if that location
-+           exists, the entry is placed there.
- 
-        Libraries that read terminfo entries are expected to check
--       for a TERMINFO directory first, look at <EM>$HOME/.terminfo</EM> if
--       TERMINFO  is  not set, and finally look in <EM>/usr/share/ter-</EM>
--       <EM>minfo</EM>.
-+       for a location specified with the TERMINFO variable first,
-+       look at  <EM>$HOME/.terminfo</EM>  if  TERMINFO  is  not  set,  and
-+       finally look in <EM>/usr/share/terminfo</EM>.
-+
-+       <STRONG>-0</STRONG>     restricts the output to a single line
- 
-        <STRONG>-1</STRONG>     restricts the output to a single column
- 
-        <STRONG>-a</STRONG>     tells  <STRONG>tic</STRONG>  to  retain  commented-out  capabilities
-               rather than discarding them.  Capabilities are com-
--              mented by prefixing them with a period.  This  sets
--              the  <STRONG>-x</STRONG> option, because it treats the commented-out
--              entries as user-defined names.  If  the  source  is
--              termcap,  accept  the 2-character names required by
-+              mented  by prefixing them with a period.  This sets
-+              the <STRONG>-x</STRONG> option, because it treats the  commented-out
-+              entries  as  user-defined  names.  If the source is
-+              termcap, accept the 2-character names  required  by
-               version 6.  Otherwise these are ignored.
- 
--       <STRONG>-C</STRONG>     Force source translation to termcap format.   Note:
--              this  differs  from the <STRONG>-C</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> in
-+       <STRONG>-C</STRONG>     Force  source translation to termcap format.  Note:
-+              this differs from the <STRONG>-C</STRONG> option of  <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>  in
-               that it does not merely translate capability names,
--              but  also  translates  terminfo  strings to termcap
-+              but also translates  terminfo  strings  to  termcap
-               format.  Capabilities that are not translatable are
--              left  in  the  entry under their terminfo names but
--              commented out with two preceding dots.
-+              left in the entry under their  terminfo  names  but
-+              commented  out with two preceding dots.  The actual
-+              format  used  incorporates  some  improvements  for
-+              escaped  characters  from  terminfo  format.  For a
-+              stricter BSD-compatible  translation,  add  the  <STRONG>-K</STRONG>
-+              option.
- 
--       <STRONG>-c</STRONG>     tells <STRONG>tic</STRONG> to only check <EM>file</EM> for errors,  including
--              syntax  problems and bad use links.  If you specify
-+       <STRONG>-c</STRONG>     tells  <STRONG>tic</STRONG> to only check <EM>file</EM> for errors, including
-+              syntax problems and bad use links.  If you  specify
-               <STRONG>-C</STRONG> (<STRONG>-I</STRONG>) with this option, the code will print warn-
-               ings about entries which, after use resolution, are
--              more than 1023 (4096) bytes long.  Due to  a  fixed
--              buffer  length  in  older  termcap libraries (and a
--              documented limit in terminfo),  these  entries  may
--              cause core dumps.
-+              more  than  1023 (4096) bytes long.  Due to a fixed
-+              buffer length in older termcap libraries,  as  well
-+              as buggy checking for the buffer length (and a doc-
-+              umented limit in terminfo), these entries may cause
-+              core dumps with other implementations.
-+
-+       <STRONG>-D</STRONG>     tells  <STRONG>tic</STRONG>  to print the database locations that it
-+              knows about, and exit.  The first location shown is
-+              the  one  to which it would write compiled terminal
-+              descriptions.   If  <STRONG>tic</STRONG>  is  not  able  to  find  a
-+              writable  database  location according to the rules
-+              summarized above, it will print  a  diagnostic  and
-+              exit  with  an error rather than printing a list of
-+              database locations.
- 
-        <STRONG>-e</STRONG> <EM>names</EM>
--              Limit  writes  and  translations  to  the following
--              comma-separated list of terminals.  If any name  or
-+              Limit writes  and  translations  to  the  following
-+              comma-separated  list of terminals.  If any name or
-               alias of a terminal matches one of the names in the
--              list, the entry will be written  or  translated  as
--              normal.   Otherwise no output will be generated for
-+              list,  the  entry  will be written or translated as
-+              normal.  Otherwise no output will be generated  for
-               it.  The option value is interpreted as a file con-
--              taining  the  list  if  it  contains a '/'.  (Note:
--              depending on how tic was compiled, this option  may
-+              taining the list if  it  contains  a  '/'.   (Note:
-+              depending  on how tic was compiled, this option may
-               require <STRONG>-I</STRONG> or <STRONG>-C</STRONG>.)
- 
-        <STRONG>-f</STRONG>     Display  complex  terminfo  strings  which  contain
--              if/then/else/endif expressions indented  for  read-
-+              if/then/else/endif  expressions  indented for read-
-               ability.
- 
--       <STRONG>-G</STRONG>     Display  constant  literals  in decimal form rather
-+       <STRONG>-G</STRONG>     Display constant literals in  decimal  form  rather
-               than their character equivalents.
- 
--       <STRONG>-g</STRONG>     Display constant character literals in quoted  form
-+       <STRONG>-g</STRONG>     Display  constant character literals in quoted form
-               rather than their decimal equivalents.
- 
-        <STRONG>-I</STRONG>     Force source translation to terminfo format.
- 
-+       <STRONG>-K</STRONG>     Suppress some longstanding  ncurses  extensions  to
-+              termcap format, e.g., "\s" for space.
-+
-        <STRONG>-L</STRONG>     Force  source  translation to terminfo format using
-               the long C variable names listed in &lt;<STRONG>term.h</STRONG>&gt;
- 
-@@ -137,78 +177,79 @@
-               from termcap to terminfo, the compiler makes a num-
-               ber of assumptions about  the  defaults  of  string
-               capabilities  <STRONG>reset1_string</STRONG>,  <STRONG>carriage_return</STRONG>, <STRONG>cur-</STRONG>
--              <STRONG>sor_left</STRONG>, <STRONG>cursor_down</STRONG>,  <STRONG>scroll_forward</STRONG>,  <STRONG>tab</STRONG>,  <STRONG>new-</STRONG>
--              <STRONG>line</STRONG>,  <STRONG>key_backspace</STRONG>,  <STRONG>key_left</STRONG>, and <STRONG>key_down</STRONG>, then
--              attempts to use obsolete  termcap  capabilities  to
--              deduce correct values.  It also normally suppresses
--              output of obsolete termcap capabilities such as <STRONG>bs</STRONG>.
--              This  option forces a more literal translation that
--              also preserves the obsolete capabilities.
-+              <STRONG>sor_left</STRONG>,   <STRONG>cursor_down</STRONG>,    <STRONG>scroll_forward</STRONG>,    <STRONG>tab</STRONG>,
-+              <STRONG>newline</STRONG>,  <STRONG>key_backspace</STRONG>,  <STRONG>key_left</STRONG>,  and  <STRONG>key_down</STRONG>,
-+              then attempts to use obsolete termcap  capabilities
-+              to  deduce  correct  values.  It also normally sup-
-+              presses output  of  obsolete  termcap  capabilities
-+              such  as  <STRONG>bs</STRONG>.   This  option  forces a more literal
-+              translation that also preserves the obsolete  capa-
-+              bilities.
- 
--       <STRONG>-o</STRONG><EM>dir</EM>  Write compiled entries to given  directory.   Over-
--              rides the TERMINFO environment variable.
-+       <STRONG>-o</STRONG><EM>dir</EM>  Write  compiled entries to given database location.
-+              Overrides the TERMINFO environment variable.
- 
-        <STRONG>-R</STRONG><EM>subset</EM>
--              Restrict  output to a given subset.  This option is
--              for use with  archaic  versions  of  terminfo  like
-+              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  out-
-+              the  full set of SVR4/XSI Curses terminfo; and out-
-               right broken ports like AIX 3.x that have their own
--              extensions incompatible with  SVr4/XSI.   Available
-+              extensions  incompatible  with SVr4/XSI.  Available
-               subsets  are  "SVr1",  "Ultrix",  "HP",  "BSD"  and
-               "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
- 
--       <STRONG>-r</STRONG>     Force entry resolution (so there are  no  remaining
--              tc  capabilities)  even  when  doing translation to
--              termcap format.  This may  be  needed  if  you  are
--              preparing  a  termcap  file  for  a termcap library
--              (such as GNU termcap through  version  1.3  or  BSD
-+       <STRONG>-r</STRONG>     Force  entry  resolution (so there are no remaining
-+              tc capabilities) even  when  doing  translation  to
-+              termcap  format.   This  may  be  needed if you are
-+              preparing a termcap  file  for  a  termcap  library
-+              (such  as  GNU  termcap  through version 1.3 or BSD
-               termcap through 4.3BSD) that does not handle multi-
-               ple tc capabilities per entry.
- 
--       <STRONG>-s</STRONG>     Summarize the compile by showing the directory into
--              which  entries  are  written,  and  the  number  of
--              entries which are compiled.
-+       <STRONG>-s</STRONG>     Summarize the compile by showing the database loca-
-+              tion into which entries are written, and the number
-+              of entries which are compiled.
- 
-        <STRONG>-T</STRONG>     eliminates size-restrictions on the generated text.
--              This  is  mainly  useful  for testing and analysis,
--              since the compiled descriptions are limited  (e.g.,
-+              This is mainly useful  for  testing  and  analysis,
-+              since  the compiled descriptions are limited (e.g.,
-               1023 for termcap, 4096 for terminfo).
- 
--       <STRONG>-t</STRONG>     tells  <STRONG>tic</STRONG>  to  discard commented-out capabilities.
-+       <STRONG>-t</STRONG>     tells <STRONG>tic</STRONG> to  discard  commented-out  capabilities.
-               Normally when translating from terminfo to termcap,
-               untranslatable capabilities are commented-out.
- 
--       <STRONG>-U</STRONG>   tells  <STRONG>tic</STRONG> to not post-process the data after parsing
--            the source file.  Normally, it infers data  which  is
--            commonly  missing in older terminfo data, or in term-
-+       <STRONG>-U</STRONG>   tells <STRONG>tic</STRONG> to not post-process the data after  parsing
-+            the  source  file.  Normally, it infers data which is
-+            commonly missing in older terminfo data, or in  term-
-             caps.
- 
-        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this
-             program, and exits.
- 
--       <STRONG>-v</STRONG><EM>n</EM>  specifies  that  (verbose) output be written to stan-
--            dard error trace information showing <STRONG>tic</STRONG>'s  progress.
--            The  optional  parameter  <EM>n</EM> is a number from 1 to 10,
--            inclusive, indicating the desired level of detail  of
--            information.   If  <EM>n</EM> is omitted, the default level is
--            1.  If <EM>n</EM> is specified and greater than 1,  the  level
-+       <STRONG>-v</STRONG><EM>n</EM>  specifies that (verbose) output be written  to  stan-
-+            dard  error trace information showing <STRONG>tic</STRONG>'s progress.
-+            The optional parameter <EM>n</EM> is a number from  1  to  10,
-+            inclusive,  indicating the desired level of detail of
-+            information.  If <EM>n</EM> is omitted, the default  level  is
-+            1.   If  <EM>n</EM> is specified and greater than 1, the level
-             of detail is increased.
- 
--       <STRONG>-w</STRONG><EM>n</EM>  specifies  the width of the output.  The parameter is
-+       <STRONG>-w</STRONG><EM>n</EM>  specifies the width of the output.  The parameter  is
-             optional.  If it is omitted, it defaults to 60.
- 
-        <STRONG>-x</STRONG>   Treat unknown capabilities as user-defined.  That is,
--            if  you  supply  a capability name which <STRONG>tic</STRONG> does not
-+            if you supply a capability name which  <STRONG>tic</STRONG>  does  not
-             recognize, it will infer its type (boolean, number or
--            string)  from  the  syntax and make an extended table
-+            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
-+            whose name begins with ``k'' are treated as  function
-             keys.
- 
--       <EM>file</EM> contains one or more <STRONG>terminfo</STRONG>  terminal  descriptions
-+       <EM>file</EM> contains  one  or more <STRONG>terminfo</STRONG> terminal descriptions
-             in source format [see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].  Each description
--            in the file describes the capabilities of a  particu-
-+            in  the file describes the capabilities of a particu-
-             lar terminal.
- 
-        The debug flag levels are as follows:
-@@ -228,73 +269,73 @@
-        9      All values computed in construction of the hash ta-
-               ble
- 
--       If the debug level <EM>n</EM> is not given, it is taken to be  one.
-+       If  the debug level <EM>n</EM> is not given, it is taken to be one.
- 
-        All but one of the capabilities recognized by <STRONG>tic</STRONG> are doc-
-        umented in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  The exception is the <STRONG>use</STRONG> capabil-
-        ity.
- 
--       When  a  <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM>  field is discovered in a terminal
--       entry currently being compiled, <STRONG>tic</STRONG> reads  in  the  binary
--       from  <STRONG>/usr/share/terminfo</STRONG> to complete the entry.  (Entries
--       created from <EM>file</EM> will be used first.  If the  environment
--       variable  <STRONG>TERMINFO</STRONG>  is  set,  that  directory  is searched
--       instead of <STRONG>/usr/share/terminfo</STRONG>.)  <STRONG>tic</STRONG> duplicates the capa-
--       bilities  in  <EM>entry</EM>-<EM>name</EM>  for  the current entry, with the
--       exception  of  those  capabilities  that  explicitly   are
-+       When a <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM> field is discovered  in  a  terminal
-+       entry  currently  being  compiled, <STRONG>tic</STRONG> reads in the binary
-+       from <STRONG>/usr/share/terminfo</STRONG> to complete the entry.   (Entries
-+       created  from <EM>file</EM> will be used first.  If the environment
-+       variable  <STRONG>TERMINFO</STRONG>  is  set,  that  database  location  is
-+       searched  instead of <STRONG>/usr/share/terminfo</STRONG>.)  <STRONG>tic</STRONG> duplicates
-+       the capabilities in <EM>entry</EM>-<EM>name</EM> for the current entry, with
-+       the  exception  of  those capabilities that explicitly are
-        defined in the current entry.
- 
--       When    an   entry,   e.g.,   <STRONG>entry_name_1</STRONG>,   contains   a
--       <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  field,  any  canceled  capabilities   in
--       <EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  must also appear in <STRONG>entry_name_1</STRONG> before <STRONG>use=</STRONG>
-+       When   an   entry,   e.g.,   <STRONG>entry_name_1</STRONG>,   contains    a
-+       <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM>   field,  any  canceled  capabilities  in
-+       <EM>entry</EM>_<EM>name</EM>_<EM>2</EM> must also appear in <STRONG>entry_name_1</STRONG> before  <STRONG>use=</STRONG>
-        for these capabilities to be canceled in <STRONG>entry_name_1</STRONG>.
- 
--       If the environment variable <STRONG>TERMINFO</STRONG> is set, the  compiled
-+       If  the environment variable <STRONG>TERMINFO</STRONG> is set, the compiled
-        results are placed there instead of <STRONG>/usr/share/terminfo</STRONG>.
- 
-        Total compiled entries cannot exceed 4096 bytes.  The name
--       field cannot exceed 512 bytes.  Terminal  names  exceeding
--       the  maximum  alias  length (32 characters on systems with
-+       field  cannot  exceed 512 bytes.  Terminal names exceeding
-+       the maximum alias length (32 characters  on  systems  with
-        long filenames, 14 characters otherwise) will be truncated
--       to  the maximum alias length and a warning message will be
-+       to the maximum alias length and a warning message will  be
-        printed.
- 
- 
- </PRE>
- <H2>COMPATIBILITY</H2><PRE>
--       There is some evidence that historic  <STRONG>tic</STRONG>  implementations
--       treated  description  fields with no whitespace in them as
--       additional aliases or short names.  This <STRONG>tic</STRONG> does  not  do
--       that,  but  it  does  warn  when description fields may be
--       treated that way and check them for dangerous  characters.
-+       There  is  some evidence that historic <STRONG>tic</STRONG> implementations
-+       treated description fields with no whitespace in  them  as
-+       additional  aliases  or short names.  This <STRONG>tic</STRONG> does not do
-+       that, but it does warn  when  description  fields  may  be
-+       treated  that way and check them for dangerous characters.
- 
- 
- </PRE>
- <H2>EXTENSIONS</H2><PRE>
-        Unlike the stock SVr4 <STRONG>tic</STRONG> command, this implementation can
--       actually compile termcap sources.   In  fact,  entries  in
--       terminfo  and  termcap  syntax  can  be  mixed in a single
--       source file.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  the  list  of  termcap
-+       actually  compile  termcap  sources.   In fact, entries in
-+       terminfo and termcap syntax  can  be  mixed  in  a  single
-+       source  file.   See  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  the list of termcap
-        names taken to be equivalent to terminfo names.
- 
--       The  SVr4  manual  pages  are  not clear on the resolution
--       rules for <STRONG>use</STRONG> capabilities.  This  implementation  of  <STRONG>tic</STRONG>
-+       The SVr4 manual pages are  not  clear  on  the  resolution
-+       rules  for  <STRONG>use</STRONG>  capabilities.  This implementation of <STRONG>tic</STRONG>
-        will find <STRONG>use</STRONG> targets anywhere in the source file, or any-
--       where in the file tree rooted at <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG>  is
--       defined),  or  in the user's <EM>$HOME/.terminfo</EM> directory (if
--       it exists), or (finally) anywhere  in  the  system's  file
--       tree of compiled entries.
-+       where  in the file tree rooted at <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is
-+       defined), or in the user's <EM>$HOME/.terminfo</EM> database (if it
-+       exists),  or  (finally) anywhere in the system's file tree
-+       of compiled entries.
- 
--       The  error  messages from this <STRONG>tic</STRONG> have the same format as
--       GNU C error messages, and can be  parsed  by  GNU  Emacs's
-+       The error messages from this <STRONG>tic</STRONG> have the same  format  as
-+       GNU  C  error  messages,  and can be parsed by GNU Emacs's
-        compile facility.
- 
--       The  <STRONG>-C</STRONG>,  <STRONG>-G</STRONG>,  <STRONG>-I</STRONG>, <STRONG>-N</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-o</STRONG>, <STRONG>-r</STRONG>,
--       <STRONG>-s</STRONG>, <STRONG>-t</STRONG> and <STRONG>-x</STRONG> options are not supported under  SVr4.   The
--       SVr4 <STRONG>-c</STRONG> mode does not report bad use links.
-+       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-C</STRONG>, <STRONG>-G</STRONG>, <STRONG>-I</STRONG>, <STRONG>-N</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>,  <STRONG>-e</STRONG>,  <STRONG>-f</STRONG>,  <STRONG>-g</STRONG>,
-+       <STRONG>-o</STRONG>,  <STRONG>-r</STRONG>,  <STRONG>-s</STRONG>,  <STRONG>-t</STRONG>  and  <STRONG>-x</STRONG> options are not supported under
-+       SVr4.  The SVr4 <STRONG>-c</STRONG> mode does not report bad use links.
- 
--       System  V does not compile entries to or read entries from
--       your <EM>$HOME/.terminfo</EM> directory unless TERMINFO is  explic-
-+       System V does not compile entries to or read entries  from
-+       your  <EM>$HOME/.terminfo</EM>  database unless TERMINFO is explic-
-        itly set to it.
- 
- 
-@@ -306,10 +347,10 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- </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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: toe.1m,v 1.23 2010/12/04 18:40:45 tom Exp @
-+  * @Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -52,7 +52,7 @@
- 
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
--       <STRONG>toe</STRONG> [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-ahuUV</STRONG>] <EM>file...</EM>
-+       <STRONG>toe</STRONG> [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-ahsuUV</STRONG>] <EM>file...</EM>
- 
- 
- </PRE>
-@@ -71,6 +71,14 @@
-               ncurses would search, rather than  only  the  first
-               one that it finds.
- 
-+              If  the  <STRONG>-s</STRONG> is also given, <STRONG>toe</STRONG> adds a column to the
-+              report, showing (like  <STRONG><A HREF="conflict.1.html">conflict(1)</A></STRONG>)  which  entries
-+              which  belong to a given terminal database.  An "*"
-+              marks entries which differ, and "+"  marks  equiva-
-+              lent entries.
-+
-+       <STRONG>-s</STRONG>     sort the output by the entry names.
-+
-        <STRONG>-u</STRONG> <EM>file</EM>
-               says  to  write  a  report  to the standard output,
-               listing dependencies in the given  terminfo/termcap
-@@ -111,7 +119,7 @@
-        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @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 @
- -->
- <HTML>
- <HEAD>
-@@ -319,16 +319,28 @@
-        <EM>name</EM> support.  Other implementations of <STRONG>tput</STRONG> on SVr4-based
-        systems such as Solaris, IRIX64 and HPUX as well as others
-        such  as  AIX  and  Tru64  provide  support  for   <EM>capname</EM>
--       operands.  A few platforms such as FreeBSD and NetBSD rec-
--       ognize termcap names rather than terminfo capability names
--       in their respective <STRONG>tput</STRONG> commands.
-+       operands.
-+
-+       A few platforms such as FreeBSD and NetBSD recognize term-
-+       cap names rather than terminfo capability names  in  their
-+       respective <STRONG>tput</STRONG> commands.
-+
-+       Most  implementations  which  provide  support for <EM>capname</EM>
-+       operands use the <EM>tparm</EM> function to  expand  parameters  in
-+       it.  That function expects a mixture of numeric and string
-+       parameters, requiring <STRONG>tput</STRONG> to  know  which  type  to  use.
-+       This implementation uses a table to determine that for the
-+       standard <EM>capname</EM> operands, and an internal  library  func-
-+       tion  to  analyze  nonstandard  <EM>capname</EM>  operands.   Other
-+       implementations may simply guess that an operand  contain-
-+       ing only digits is intended to be a number.
- 
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+       <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2011 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 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tset.1,v 1.25 2010/12/04 18:38:55 tom Exp @
-+  * @Id: tset.1,v 1.27 2011/12/17 23:20:35 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -116,8 +116,9 @@
- 
-        The options are as follows:
- 
--       <STRONG>-c</STRONG>   Set  control  characters and modes.  <STRONG>-e</STRONG> Set the erase
--            character to <EM>ch</EM>.
-+       <STRONG>-c</STRONG>   Set control characters and modes.
-+
-+       <STRONG>-e</STRONG>   Set the erase character to <EM>ch</EM>.
- 
-        <STRONG>-I</STRONG>   Do  not  send  the  terminal  or  tab  initialization
-             strings to the terminal.
-@@ -126,51 +127,51 @@
- 
-        <STRONG>-k</STRONG>   Set the line kill character to <EM>ch</EM>.
- 
--       <STRONG>-m</STRONG>   Specify  a  mapping  from  a port type to a terminal.
-+       <STRONG>-m</STRONG>   Specify a mapping from a port  type  to  a  terminal.
-             See the section <STRONG>TERMINAL</STRONG> <STRONG>TYPE</STRONG> <STRONG>MAPPING</STRONG> for more infor-
-             mation.
- 
--       <STRONG>-Q</STRONG>   Do  not  display  any values for the erase, interrupt
-+       <STRONG>-Q</STRONG>   Do not display any values for  the  erase,  interrupt
-             and line kill characters.  Normally <STRONG>tset</STRONG> displays the
--            values  for  control characters which differ from the
-+            values for control characters which differ  from  the
-             system's default values.
- 
--       <STRONG>-q</STRONG>   The terminal type is displayed to the  standard  out-
--            put,  and the terminal is not initialized in any way.
-+       <STRONG>-q</STRONG>   The  terminal  type is displayed to the standard out-
-+            put, and the terminal is not initialized in any  way.
-             The option `-' by itself is equivalent but archaic.
- 
-        <STRONG>-r</STRONG>   Print the terminal type to the standard error output.
- 
--       <STRONG>-s</STRONG>   Print  the  sequence  of shell commands to initialize
-+       <STRONG>-s</STRONG>   Print the sequence of shell  commands  to  initialize
-             the environment variable <STRONG>TERM</STRONG> to the standard output.
--            See  the section <STRONG>SETTING</STRONG> <STRONG>THE</STRONG> <STRONG>ENVIRONMENT</STRONG> for details.
-+            See the section <STRONG>SETTING</STRONG> <STRONG>THE</STRONG> <STRONG>ENVIRONMENT</STRONG> for  details.
- 
-        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this
-             program, and exits.
- 
--       <STRONG>-w</STRONG>   Resize  the  window  to  match  the  size deduced via
-+       <STRONG>-w</STRONG>   Resize the window  to  match  the  size  deduced  via
-             <STRONG>setupterm</STRONG>.   Normally  this  has  no  effect,  unless
-             <STRONG>setupterm</STRONG> is not able to detect the window size.
- 
-        The arguments for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be
--       entered as actual characters or by using the  `hat'  nota-
--       tion,  i.e.,  control-h  may  be  specified  as  ``^H'' or
-+       entered  as  actual characters or by using the `hat' nota-
-+       tion, i.e.,  control-h  may  be  specified  as  ``^H''  or
-        ``^h''.
- 
- 
- </PRE>
- <H2>SETTING THE ENVIRONMENT</H2><PRE>
--       It is often desirable  to  enter  the  terminal  type  and
--       information  about  the  terminal's  capabilities into the
-+       It  is  often  desirable  to  enter  the terminal type and
-+       information about the  terminal's  capabilities  into  the
-        shell's environment.  This is done using the <STRONG>-s</STRONG> option.
- 
-        When the <STRONG>-s</STRONG> option is specified, the commands to enter the
--       information  into  the  shell's environment are written to
--       the standard output.  If the <STRONG>SHELL</STRONG> environmental  variable
-+       information into the shell's environment  are  written  to
-+       the  standard output.  If the <STRONG>SHELL</STRONG> environmental variable
-        ends in ``csh'', the commands are for <STRONG>csh</STRONG>, otherwise, they
--       are for <STRONG>sh</STRONG>.  Note, the <STRONG>csh</STRONG>  commands  set  and  unset  the
--       shell  variable  <STRONG>noglob</STRONG>,  leaving it unset.  The following
--       line in the <STRONG>.login</STRONG> or <STRONG>.profile</STRONG> files will  initialize  the
-+       are  for  <STRONG>sh</STRONG>.   Note,  the  <STRONG>csh</STRONG> commands set and unset the
-+       shell variable <STRONG>noglob</STRONG>, leaving it  unset.   The  following
-+       line  in  the <STRONG>.login</STRONG> or <STRONG>.profile</STRONG> files will initialize the
-        environment correctly:
- 
-            eval `tset -s options ... `
-@@ -180,107 +181,107 @@
- <H2>TERMINAL TYPE MAPPING</H2><PRE>
-        When the terminal is not hardwired into the system (or the
-        current system information is incorrect) the terminal type
--       derived  from the <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG> environmental
--       variable is often something generic like <STRONG>network</STRONG>,  <STRONG>dialup</STRONG>,
--       or  <STRONG>unknown</STRONG>.   When <STRONG>tset</STRONG> is used in a startup script it is
--       often desirable to provide information about the  type  of
-+       derived from the <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG>  environmental
-+       variable  is often something generic like <STRONG>network</STRONG>, <STRONG>dialup</STRONG>,
-+       or <STRONG>unknown</STRONG>.  When <STRONG>tset</STRONG> is used in a startup script  it  is
-+       often  desirable  to provide information about the type of
-        terminal used on such ports.
- 
--       The  purpose  of  the <STRONG>-m</STRONG> option is to map from some set of
--       conditions to a terminal type, that is, to tell <STRONG>tset</STRONG>  ``If
--       I'm  on this port at a particular speed, guess that I'm on
-+       The purpose of the <STRONG>-m</STRONG> option is to map from  some  set  of
-+       conditions  to a terminal type, that is, to tell <STRONG>tset</STRONG> ``If
-+       I'm on this port at a particular speed, guess that I'm  on
-        that kind of terminal''.
- 
-        The argument to the <STRONG>-m</STRONG> option consists of an optional port
-        type, an optional operator, an optional baud rate specifi-
-        cation, an optional colon (``:'') character and a terminal
--       type.   The port type is a string (delimited by either the
-+       type.  The port type is a string (delimited by either  the
-        operator or the colon character).  The operator may be any
-        combination of ``&gt;'', ``&lt;'', ``@'', and ``!''; ``&gt;'' means
--       greater than, ``&lt;'' means less than, ``@'' means equal  to
-+       greater  than, ``&lt;'' means less than, ``@'' means equal to
-        and ``!'' inverts the sense of the test.  The baud rate is
--       specified as a number and is compared with  the  speed  of
--       the  standard  error  output  (which should be the control
-+       specified  as  a  number and is compared with the speed of
-+       the standard error output (which  should  be  the  control
-        terminal).  The terminal type is a string.
- 
-        If the terminal type is not specified on the command line,
--       the  <STRONG>-m</STRONG> mappings are applied to the terminal type.  If the
--       port type and baud rate match the  mapping,  the  terminal
--       type  specified  in the mapping replaces the current type.
--       If more than one mapping is specified, the first  applica-
-+       the <STRONG>-m</STRONG> mappings are applied to the terminal type.  If  the
-+       port  type  and  baud rate match the mapping, the terminal
-+       type specified in the mapping replaces the  current  type.
-+       If  more than one mapping is specified, the first applica-
-        ble mapping is used.
- 
--       For    example,    consider    the    following   mapping:
-+       For   example,    consider    the    following    mapping:
-        <STRONG>dialup&gt;9600:vt100</STRONG>.  The port type is dialup , the operator
--       is  &gt;, the baud rate specification is 9600, and the termi-
-+       is &gt;, the baud rate specification is 9600, and the  termi-
-        nal type is vt100.  The result of this mapping is to spec-
-        ify that if the terminal type is <STRONG>dialup</STRONG>, and the baud rate
--       is greater than 9600 baud, a terminal type of  <STRONG>vt100</STRONG>  will
-+       is  greater  than 9600 baud, a terminal type of <STRONG>vt100</STRONG> will
-        be used.
- 
-        If no baud rate is specified, the terminal type will match
-        any baud rate.  If no port type is specified, the terminal
--       type   will   match   any  port  type.   For  example,  <STRONG>-m</STRONG>
-+       type  will  match  any  port  type.    For   example,   <STRONG>-m</STRONG>
-        <STRONG>dialup:vt100</STRONG>  <STRONG>-m</STRONG>  <STRONG>:?xterm</STRONG>  will  cause  any  dialup  port,
-        regardless of baud rate, to match the terminal type vt100,
--       and any non-dialup port type to match  the  terminal  type
--       ?xterm.   Note,  because of the leading question mark, the
--       user will be queried on a default port as to whether  they
-+       and  any  non-dialup  port type to match the terminal type
-+       ?xterm.  Note, because of the leading question  mark,  the
-+       user  will be queried on a default port as to whether they
-        are actually using an xterm terminal.
- 
--       No  whitespace  characters  are permitted in the <STRONG>-m</STRONG> option
--       argument.  Also, to avoid problems  with  meta-characters,
--       it  is  suggested  that  the  entire <STRONG>-m</STRONG> option argument be
--       placed within single quote characters, and that <STRONG>csh</STRONG>  users
--       insert  a  backslash character (``\'') before any exclama-
-+       No whitespace characters are permitted in  the  <STRONG>-m</STRONG>  option
-+       argument.   Also,  to avoid problems with meta-characters,
-+       it is suggested that the  entire  <STRONG>-m</STRONG>  option  argument  be
-+       placed  within single quote characters, and that <STRONG>csh</STRONG> users
-+       insert a backslash character (``\'') before  any  exclama-
-        tion marks (``!'').
- 
- 
- </PRE>
- <H2>HISTORY</H2><PRE>
--       The <STRONG>tset</STRONG> command appeared in BSD 3.0.  The <STRONG>ncurses</STRONG>  imple-
--       mentation  was lightly adapted from the 4.4BSD sources for
-+       The  <STRONG>tset</STRONG> command appeared in BSD 3.0.  The <STRONG>ncurses</STRONG> imple-
-+       mentation was lightly adapted from the 4.4BSD sources  for
-        a terminfo environment by Eric S. Raymond &lt;esr@snark.thyr-
-        sus.com&gt;.
- 
- 
- </PRE>
- <H2>COMPATIBILITY</H2><PRE>
--       The  <STRONG>tset</STRONG>  utility has been provided for backward-compati-
--       bility with BSD environments (under  most  modern  UNIXes,
--       <STRONG>/etc/inittab</STRONG>  and  <STRONG><A HREF="getty.1.html">getty(1)</A></STRONG> can set <STRONG>TERM</STRONG> appropriately for
--       each dial-up line; this  obviates  what  was  <STRONG>tset</STRONG>'s  most
--       important  use).   This implementation behaves like 4.4BSD
-+       The <STRONG>tset</STRONG> utility has been provided  for  backward-compati-
-+       bility  with  BSD  environments (under most modern UNIXes,
-+       <STRONG>/etc/inittab</STRONG> and <STRONG><A HREF="getty.1.html">getty(1)</A></STRONG> can set <STRONG>TERM</STRONG>  appropriately  for
-+       each  dial-up  line;  this  obviates  what was <STRONG>tset</STRONG>'s most
-+       important use).  This implementation behaves  like  4.4BSD
-        tset, with a few exceptions specified here.
- 
--       The <STRONG>-S</STRONG> option of BSD tset no longer works;  it  prints  an
-+       The  <STRONG>-S</STRONG>  option  of BSD tset no longer works; it prints an
-        error message to stderr and dies.  The <STRONG>-s</STRONG> option only sets
--       <STRONG>TERM</STRONG>, not <STRONG>TERMCAP</STRONG>.  Both these  changes  are  because  the
--       <STRONG>TERMCAP</STRONG>  variable  is  no longer supported under terminfo-
-+       <STRONG>TERM</STRONG>,  not  <STRONG>TERMCAP</STRONG>.   Both  these changes are because the
-+       <STRONG>TERMCAP</STRONG> variable is no longer  supported  under  terminfo-
-        based <STRONG>ncurses</STRONG>, which makes <STRONG>tset</STRONG> <STRONG>-S</STRONG> useless (we made it die
-        noisily rather than silently induce lossage).
- 
--       There  was  an  undocumented  4.4BSD feature that invoking
-+       There was an undocumented  4.4BSD  feature  that  invoking
-        tset via a link named `TSET` (or via any other name begin-
--       ning  with  an  upper-case letter) set the terminal to use
-+       ning with an upper-case letter) set the  terminal  to  use
-        upper-case only.  This feature has been omitted.
- 
--       The <STRONG>-A</STRONG>, <STRONG>-E</STRONG>, <STRONG>-h</STRONG>, <STRONG>-u</STRONG> and <STRONG>-v</STRONG> options were  deleted  from  the
--       <STRONG>tset</STRONG>  utility  in 4.4BSD.  None of them were documented in
--       4.3BSD and all are of limited utility at  best.   The  <STRONG>-a</STRONG>,
-+       The  <STRONG>-A</STRONG>,  <STRONG>-E</STRONG>,  <STRONG>-h</STRONG>, <STRONG>-u</STRONG> and <STRONG>-v</STRONG> options were deleted from the
-+       <STRONG>tset</STRONG> utility in 4.4BSD.  None of them were  documented  in
-+       4.3BSD  and  all  are of limited utility at best.  The <STRONG>-a</STRONG>,
-        <STRONG>-d</STRONG>, and <STRONG>-p</STRONG> options are similarly not documented or useful,
--       but were retained as they appear to be in widespread  use.
--       It  is  strongly recommended that any usage of these three
--       options be changed to use the <STRONG>-m</STRONG> option instead.   The  <STRONG>-n</STRONG>
--       option  remains, but has no effect.  The <STRONG>-adnp</STRONG> options are
-+       but  were retained as they appear to be in widespread use.
-+       It is strongly recommended that any usage of  these  three
-+       options  be  changed to use the <STRONG>-m</STRONG> option instead.  The <STRONG>-n</STRONG>
-+       option remains, but has no effect.  The <STRONG>-adnp</STRONG> options  are
-        therefore omitted from the usage summary above.
- 
--       It is still permissible to specify  the  <STRONG>-e</STRONG>,  <STRONG>-i</STRONG>,  and  <STRONG>-k</STRONG>
--       options  without arguments, although it is strongly recom-
--       mended that such usage be fixed to explicitly specify  the
-+       It  is  still  permissible  to  specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG>
-+       options without arguments, although it is strongly  recom-
-+       mended  that such usage be fixed to explicitly specify the
-        character.
- 
--       As  of  4.4BSD,  executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies
-+       As of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG>  no  longer  implies
-        the <STRONG>-Q</STRONG> option.  Also, the interaction between the - option
-        and the <EM>terminal</EM> argument in some historic implementations
-        of <STRONG>tset</STRONG> has been removed.
-@@ -294,7 +295,7 @@
-             tells <STRONG>tset</STRONG> whether to initialize <STRONG>TERM</STRONG> using <STRONG>sh</STRONG> or <STRONG>csh</STRONG>
-             syntax.
- 
--       TERM Denotes  your  terminal  type.  Each terminal type is
-+       TERM Denotes your terminal type.  Each  terminal  type  is
-             distinct, though many are similar.
- 
-        TERMCAP
-@@ -307,7 +308,7 @@
- </PRE>
- <H2>FILES</H2><PRE>
-        /etc/ttys
--            system  port  name  to terminal type mapping database
-+            system port name to terminal  type  mapping  database
-             (BSD versions only).
- 
-        /usr/share/terminfo
-@@ -316,10 +317,10 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>, <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>,  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>,  ter-
-+       <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>,  <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>,  <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>,  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>, ter-
-        <STRONG><A HREF="minfo.5.html">minfo(5)</A></STRONG>, <STRONG><A HREF="ttys.5.html">ttys(5)</A></STRONG>, <STRONG><A HREF="environ.7.html">environ(7)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404).
-+       This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107).
- 
- 
- 
-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-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 $
-+# $Id: Makefile.in,v 1.54 2011/08/07 15:46:50 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 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"), #
-@@ -102,6 +102,7 @@
- SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
- 
-+RPATH_LIST	= @RPATH_LIST@
- MK_SHARED_LIB	= @MK_SHARED_LIB@
- 
- NCURSES_MAJOR	= @NCURSES_MAJOR@
-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-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_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.40 2012/03/11 00:37:16 tom Exp $")
- 
- /* this can't be readonly */
- static FIELD default_field =
-@@ -65,8 +65,7 @@
-   NCURSES_FIELD_EXTENSION
- };
- 
--NCURSES_EXPORT_VAR(FIELD *)
--_nc_Default_Field = &default_field;
-+NCURSES_EXPORT_VAR(FIELD *) _nc_Default_Field = &default_field;
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform
-@@ -186,10 +185,12 @@
-     {
-       if ((typ->status & _LINKED_TYPE) != 0)
- 	{
--	  assert(argp != 0);
--	  _nc_Free_Argument(typ->left, argp->left);
--	  _nc_Free_Argument(typ->right, argp->right);
--	  free(argp);
-+	  if (argp != 0)
-+	    {
-+	      _nc_Free_Argument(typ->left, argp->left);
-+	      _nc_Free_Argument(typ->right, argp->right);
-+	      free(argp);
-+	    }
- 	}
-       else
- 	{
-@@ -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-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_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.102 2012/07/21 23:23:08 tom Exp $")
- 
- /*----------------------------------------------------------------------------
-   This is the core module of the form library. It contains the majority
-@@ -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);
- 	    }
--	  if ((form->curpage == field->page))
-+	  if (form->curpage == field->page)
- 	    {
--	      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-08-25 19:57:59.423234170 +0000
-+++ ncurses-5.9/include/Caps	2012-08-25 19:57:59.973231570 +0000
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 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,7 +29,7 @@
- # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
- #    and: Eric S. Raymond <esr@snark.thyrsus.com>
- #
--# $Id: Caps,v 1.37 2010/12/04 18:47:13 tom Exp $
-+# $Id: Caps,v 1.38 2011/10/15 23:10:18 tom Exp $
- #
- # This is the master termcap/terminfo capability table.
- #
-@@ -738,11 +738,13 @@
- #%.ad
- #%
- #%.in .8i
--#%The XSI Curses standard added these.  They are some post-4.1 
--#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x.
--#%The \fBncurses\fR termcap names for them are invented; according to the
--#%XSI Curses standard, they have no termcap names.  If your compiled terminfo
--#%entries use these, they may not be binary-compatible with System V terminfo
-+#%The XSI Curses standard added these hardcopy capabilities.
-+#%They were used in some post-4.1 versions of System V curses,
-+#%e.g., Solaris 2.5 and IRIX 6.x.
-+#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented.
-+#%According to the XSI Curses standard, they have no termcap names.
-+#%If your compiled terminfo entries use these,
-+#%they may not be binary-compatible with System V terminfo
- #%entries after SVr4.1; beware!
- #%
- #%.na
-@@ -760,7 +762,7 @@
- enter_top_hl_mode		ethlm	str	Xt	-		-	-----	Enter top highlight mode
- enter_vertical_hl_mode		evhlm	str	Xv	-		-	-----	Enter vertical highlight mode
- set_a_attributes		sgr1	str	sA	-		-	-----	Define second set of video attributes #1-#6
--set_pglen_inch			slength	str	sL	-		-	-----	YI Set page length to #1 hundredth of an inch
-+set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
- #%.TE
- #%.ad
- #
-diff -Naur ncurses-5.9.orig/include/Caps.aix4 ncurses-5.9/include/Caps.aix4
---- 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 @@
- ##############################################################################
--# Copyright (c) 2001-2006,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 2001-2010,2011 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 @@
- #
- # Author: Thomas Dickey
- #
--# $Id: Caps.aix4,v 1.8 2010/12/04 18:47:13 tom Exp $
-+# $Id: Caps.aix4,v 1.9 2011/10/15 23:19:16 tom Exp $
- #
- # This is an adaptation of ncurses' termcap/terminfo capability table, which
- # is designed to align with AIX 4.x's terminfo.
-@@ -840,11 +840,13 @@
- #%.ad
- #%
- #%.in .8i
--#%The XSI Curses standard added these.  They are some post-4.1 
--#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x.
--#%The \fBncurses\fR termcap names for them are invented; according to the
--#%XSI Curses standard, they have no termcap names.  If your compiled terminfo
--#%entries use these, they may not be binary-compatible with System V terminfo
-+#%The XSI Curses standard added these hardcopy capabilities.
-+#%They were used in some post-4.1 versions of System V curses,
-+#%e.g., Solaris 2.5 and IRIX 6.x.
-+#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented.
-+#%According to the XSI Curses standard, they have no termcap names.
-+#%If your compiled terminfo entries use these,
-+#%they may not be binary-compatible with System V terminfo
- #%entries after SVr4.1; beware!
- #%
- #%.na
-@@ -862,7 +864,7 @@
- enter_top_hl_mode		ethlm	str	Xt	-		-	-----	Enter top highlight mode
- enter_vertical_hl_mode		evhlm	str	Xv	-		-	-----	Enter vertical highlight mode
- set_a_attributes		sgr1	str	sA	-		-	-----	Define second set of video attributes #1-#6
--set_pglen_inch			slength	str	sL	-		-	-----	YI Set page length to #1 hundredth of an inch
-+set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
- #%.TE
- #%.ad
- #
-diff -Naur ncurses-5.9.orig/include/Caps.hpux11 ncurses-5.9/include/Caps.hpux11
---- 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 @@
- ##############################################################################
--# Copyright (c) 2002-2006,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 2002-2010,2011 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 @@
- #
- # Author: Thomas Dickey
- #
--# $Id: Caps.hpux11,v 1.5 2010/12/04 18:47:13 tom Exp $
-+# $Id: Caps.hpux11,v 1.6 2011/10/15 23:20:04 tom Exp $
- #
- # This is an adaptation of ncurses' termcap/terminfo capability table, which
- # is designed to align with HPUX 11.x's terminfo.
-@@ -746,11 +746,13 @@
- #%.ad
- #%
- #%.in .8i
--#%The XSI Curses standard added these.  They are some post-4.1 
--#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x.
--#%The \fBncurses\fR termcap names for them are invented; according to the
--#%XSI Curses standard, they have no termcap names.  If your compiled terminfo
--#%entries use these, they may not be binary-compatible with System V terminfo
-+#%The XSI Curses standard added these hardcopy capabilities.
-+#%They were used in some post-4.1 versions of System V curses,
-+#%e.g., Solaris 2.5 and IRIX 6.x.
-+#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented.
-+#%According to the XSI Curses standard, they have no termcap names.
-+#%If your compiled terminfo entries use these,
-+#%they may not be binary-compatible with System V terminfo
- #%entries after SVr4.1; beware!
- #%
- #%.na
-@@ -761,7 +763,7 @@
- #%lw25 lw6 lw2 lw20.
- #%\fBVariable	Cap-	TCap	Description\fR
- #%\fBString	name	Code\fR
--set_pglen_inch			slength	str	sL	-		-	-----	YI Set page length to #1 hundredth of an inch
-+set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
- enter_horizontal_hl_mode	ehhlm	str	Xh	-		-	-----	Enter horizontal highlight mode
- enter_left_hl_mode		elhlm	str	Xl	-		-	-----	Enter left highlight mode
- 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-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 @@
- ##############################################################################
--# Copyright (c) 2001-2006,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 2001-2010,2011 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,7 +29,7 @@
- # Author: Thomas Dickey
- #    and: Ilya Zakharevich
- #
--# $Id: Caps.keys,v 1.4 2010/12/04 18:47:13 tom Exp $
-+# $Id: Caps.keys,v 1.5 2011/10/15 23:19:52 tom Exp $
- #
- # This is an adaptation of ncurses' termcap/terminfo capability table, which
- # is illustrates an experimental extension to describe alt-, shift- and
-@@ -828,11 +828,13 @@
- #%.ad
- #%
- #%.in .8i
--#%The XSI Curses standard added these.  They are some post-4.1 
--#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x.
--#%The \fBncurses\fR termcap names for them are invented; according to the
--#%XSI Curses standard, they have no termcap names.  If your compiled terminfo
--#%entries use these, they may not be binary-compatible with System V terminfo
-+#%The XSI Curses standard added these hardcopy capabilities.
-+#%They were used in some post-4.1 versions of System V curses,
-+#%e.g., Solaris 2.5 and IRIX 6.x.
-+#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented.
-+#%According to the XSI Curses standard, they have no termcap names.
-+#%If your compiled terminfo entries use these,
-+#%they may not be binary-compatible with System V terminfo
- #%entries after SVr4.1; beware!
- #%
- #%.na
-@@ -850,7 +852,7 @@
- enter_top_hl_mode		ethlm	str	Xt	-		-	-----	Enter top highlight mode
- enter_vertical_hl_mode		evhlm	str	Xv	-		-	-----	Enter vertical highlight mode
- set_a_attributes		sgr1	str	sA	-		-	-----	Define second set of video attributes #1-#6
--set_pglen_inch			slength	str	sL	-		-	-----	YI Set page length to #1 hundredth of an inch
-+set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
- #%.TE
- #%.ad
- #
-diff -Naur ncurses-5.9.orig/include/Caps.osf1r5 ncurses-5.9/include/Caps.osf1r5
---- 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 @@
- ##############################################################################
--# Copyright (c) 2002-2006,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 2002-2010,2011 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 @@
- #
- # Author: Thomas Dickey
- #
--# $Id: Caps.osf1r5,v 1.5 2010/12/04 18:47:13 tom Exp $
-+# $Id: Caps.osf1r5,v 1.6 2011/10/15 22:52:09 tom Exp $
- #
- # This is an adaptation of ncurses' termcap/terminfo capability table, which
- # is designed to align with OSF/1 version 5 (Tru64) terminfo.
-@@ -769,7 +769,7 @@
- xoff_character			xoffc	str	XF	-		-	-----	XOFF character
- xon_character			xonc	str	XN	-		-	-----	XON character
- zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
--set_pglen_inch			slength	str	sL	-		-	-----	YI Set page length to #1 hundredth of an inch
-+set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
- enter_horizontal_hl_mode	ehhlm	str	Xh	-		-	-----	Enter horizontal highlight mode
- enter_left_hl_mode		elhlm	str	Xl	-		-	-----	Enter left highlight mode
- 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-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
- BEGIN		{
- 		    print  "/****************************************************************************"
--		    print  " * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *"
-+		    print  " * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *"
- 		    print  " *                                                                          *"
- 		    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
- 		    print  " * copy of this software and associated documentation files (the            *"
-@@ -34,7 +34,7 @@
- 		    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
- 		    print  "/****************************************************************************/"
- 		    print  ""
--		    print  "/* $Id: MKterm.h.awk.in,v 1.58 2010/01/09 19:53:26 tom Exp $ */"
-+		    print  "/* $Id: MKterm.h.awk.in,v 1.60 2011/06/25 20:51:00 tom Exp $ */"
- 		    print  ""
- 		    print  "/*"
- 		    print  "**	term.h -- Definition of struct term"
-@@ -93,41 +93,6 @@
- 		    print  "#include <termio.h>"
- 		    print  "#define TTY struct termio"
- 		    print  ""
--		    print  "/* Add definitions to make termio look like termios."
--		    print  " * But ifdef it, since there are some implementations"
--		    print  " * that try to do this for us in a fake <termio.h>."
--		    print  " */"
--		    print  "#ifndef TCSANOW"
--		    print  "#define TCSANOW TCSETA"
--		    print  "#endif"
--		    print  "#ifndef TCSADRAIN"
--		    print  "#define TCSADRAIN TCSETAW"
--		    print  "#endif"
--		    print  "#ifndef TCSAFLUSH"
--		    print  "#define TCSAFLUSH TCSETAF"
--		    print  "#endif"
--		    print  "#ifndef tcsetattr"
--		    print  "#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)"
--		    print  "#endif"
--		    print  "#ifndef tcgetattr"
--		    print  "#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)"
--		    print  "#endif"
--		    print  "#ifndef cfgetospeed"
--		    print  "#define cfgetospeed(t) ((t)->c_cflag & CBAUD)"
--		    print  "#endif"
--		    print  "#ifndef TCIFLUSH "
--		    print  "#define TCIFLUSH 0"
--		    print  "#endif"
--		    print  "#ifndef TCOFLUSH "
--		    print  "#define TCOFLUSH 1"
--		    print  "#endif"
--		    print  "#ifndef TCIOFLUSH "
--		    print  "#define TCIOFLUSH 2"
--		    print  "#endif"
--		    print  "#ifndef tcflush"
--		    print  "#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)"
--		    print  "#endif"
--		    print  ""
- 		    print  "#else /* !HAVE_TERMIO_H */"
- 		    print  ""
- 		    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-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                 *
-  ****************************************************************************/
- 
--/* $Id: curses.h.in,v 1.220 2011/01/22 19:47:20 tom Exp $ */
-+/* $Id: curses.h.in,v 1.232 2012/07/28 18:17:43 tom Exp $ */
- 
- #ifndef __NCURSES_H
- #define __NCURSES_H
-@@ -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 @@
- 
- /*
-  * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or
-- * conflicting) when _XOPEN_SOURCE is 500 or greater.
-+ * conflicting) when _XOPEN_SOURCE is 500 or greater.  If NCURSES_WIDECHAR is
-+ * not already defined, e.g., if the platform relies upon nonstandard feature
-+ * test macros, define it at this point if the standard feature test macros
-+ * indicate that it should be defined.
-  */
--#undef NCURSES_WIDECHAR
--#if defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)
--#define NCURSES_WIDECHAR
-+#ifndef NCURSES_WIDECHAR
-+#if defined(_XOPEN_SOURCE_EXTENDED) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500))
-+#define NCURSES_WIDECHAR 1
-+#else
-+#define NCURSES_WIDECHAR 0
- #endif
-+#endif /* NCURSES_WIDECHAR */
- 
- #include <stdarg.h>	/* we need va_list */
--#ifdef NCURSES_WIDECHAR
-+#if NCURSES_WIDECHAR
- #include <stddef.h>	/* we want wchar_t */
- #endif
- 
-@@ -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 */
- 
--#ifdef NCURSES_WIDECHAR
-+#if NCURSES_WIDECHAR
- 
- #if @NCURSES_LIBUTF8@
- #ifdef mblen			/* libutf8.h defines it w/o undefining first */
-@@ -366,7 +379,7 @@
- /*
-  * cchar_t stores an array of CCHARW_MAX wide characters.  The first is
-  * normally a spacing character.  The others are non-spacing.  If those
-- * (spacing and nonspacing) do not fill the array, a null L'\0' follows. 
-+ * (spacing and nonspacing) do not fill the array, a null L'\0' follows.
-  * Otherwise, a null is assumed to follow when extracting via getcchar().
-  */
- #define CCHARW_MAX	@NCURSES_CCHARW_MAX@
-@@ -434,7 +447,7 @@
- 
- 	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
- 
--#ifdef NCURSES_WIDECHAR
-+#if NCURSES_WIDECHAR
- 	cchar_t  _bkgrnd;	/* current background char/attribute pair */
- #if @NCURSES_EXT_COLORS@
- 	int	_color;		/* current color-pair for non-space character */
-@@ -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.
-  */
--#ifndef NCURSES_WIDECHAR
-+#if !NCURSES_WIDECHAR
- #define vid_attr(a,pair,opts) vidattr(a)
- #endif
- 
-@@ -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)
- 
- #if !NCURSES_OPAQUE
--#if defined(NCURSES_WIDECHAR) && @NCURSES_EXT_COLORS@
-+#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
- #define wattrset(win,at)	((win) \
- 				  ? ((win)->_color = PAIR_NUMBER(at), \
-                                      (win)->_attrs = NCURSES_CAST(attr_t, at), \
-@@ -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)
- 
- #if !NCURSES_OPAQUE
--#define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
-+#define redrawwin(win)		wredrawln(win, 0, ((win) ? (win)->_maxy+1 : -1))
- #endif /* NCURSES_OPAQUE */
- 
- #define waddstr(win,str)	waddnstr(win,str,-1)
-@@ -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.
-  */
- #if !NCURSES_OPAQUE
--#define getbkgd(win)                    ((win)->_bkgd)
-+#define getbkgd(win)                    ((win) ? ((win)->_bkgd) : 0)
- #endif /* NCURSES_OPAQUE */
- 
- #define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
- #define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
- 
- #if !NCURSES_OPAQUE
--#if defined(NCURSES_WIDECHAR) && @NCURSES_EXT_COLORS@
--#define wattr_set(win,a,p,opts)		((win)->_attrs = ((a) & ~A_COLOR), \
--					 (win)->_color = (p), \
-+#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
-+#define wattr_set(win,a,p,opts)		(((win) \
-+					  ? ((win)->_attrs = ((a) & ~A_COLOR), \
-+					     (win)->_color = (p)) \
-+					  : OK), \
- 					 OK)
--#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
--					 (void)((p) != (void *)0 && (*(p) = (short)(win)->_color)), \
-+#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-+					 (void)(((p) != (void *)0) ? (*(p) = (win) ? (short)(win)->_color : 0) : OK), \
- 					 OK)
- #else
--#define wattr_set(win,a,p,opts)		((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p)), OK)
--#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
--					 (void)((p) != (void *)0 && (*(p) = (short)PAIR_NUMBER((win)->_attrs))), \
-+#define wattr_set(win,a,p,opts)		(((win) \
-+					  ? ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p))) \
-+					  : OK), \
-+					 OK)
-+#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-+					 (void)(((p) != (void *)0) ? (*(p) = (win) ? (short)PAIR_NUMBER((win)->_attrs) : 0) : OK), \
- 					 OK)
- #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-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 $ */
-+/* $Id: curses.tail,v 1.21 2011/10/29 20:03:22 tom Exp $ */
- /*
-  * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-@@ -133,7 +133,7 @@
- extern NCURSES_EXPORT(char *) _tracechar (int);
- extern NCURSES_EXPORT(char *) _tracechtype (chtype);
- extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
--#ifdef NCURSES_WIDECHAR
-+#if NCURSES_WIDECHAR
- #define _tracech_t		_tracecchar_t
- extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *);
- #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-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.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,11 +6,11 @@
-  */
- #define _XOPEN_CURSES 1
- 
--#ifdef NCURSES_WIDECHAR
-+#if NCURSES_WIDECHAR
- 
- extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
- 
--#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
--#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
-+#define wgetbkgrnd(win,wch)		((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK)
- #endif
- 
--#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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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,10 +29,11 @@
- /****************************************************************************
-  *  Author: Thomas E. Dickey                    1996-on                     *
-  ****************************************************************************/
--/* $Id: nc_alloc.h,v 1.18 2010/11/20 22:59:49 tom Exp $ */
-+/* $Id: nc_alloc.h,v 1.19 2011/10/22 16:54:57 tom Exp $ */
- 
- #ifndef NC_ALLOC_included
- #define NC_ALLOC_included 1
-+/* *INDENT-OFF* */
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -101,12 +102,14 @@
- /* entries.c */
- extern NCURSES_EXPORT(void) _nc_leaks_tinfo(void);
- 
--#define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type))
--#define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type))
--#define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type))
-+#define typeMalloc(type,elts) (type *)malloc((size_t)(elts)*sizeof(type))
-+#define typeCalloc(type,elts) (type *)calloc((size_t)(elts),sizeof(type))
-+#define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (size_t)(elts)*sizeof(type))
- 
- #ifdef __cplusplus
- }
- #endif
- 
-+/* *INDENT-ON* */
-+
- #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-08-25 19:57:59.989898157 +0000
-@@ -0,0 +1,171 @@
-+/****************************************************************************
-+ * Copyright (c) 2011 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                        2011                    *
-+ ****************************************************************************/
-+
-+/* $Id: nc_termios.h,v 1.2 2011/06/25 20:44:05 tom Exp $ */
-+
-+#ifndef NC_TERMIOS_included
-+#define NC_TERMIOS_included 1
-+
-+#if HAVE_TERMIOS_H && HAVE_TCGETATTR
-+
-+#else /* !HAVE_TERMIOS_H */
-+
-+#if HAVE_TERMIO_H
-+
-+/* Add definitions to make termio look like termios.
-+ * But ifdef it, since there are some implementations
-+ * that try to do this for us in a fake <termio.h>.
-+ */
-+#ifndef TCSADRAIN
-+#define TCSADRAIN TCSETAW
-+#endif
-+#ifndef TCSAFLUSH
-+#define TCSAFLUSH TCSETAF
-+#endif
-+#ifndef tcsetattr
-+#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)
-+#endif
-+#ifndef tcgetattr
-+#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)
-+#endif
-+#ifndef cfgetospeed
-+#define cfgetospeed(t) ((t)->c_cflag & CBAUD)
-+#endif
-+#ifndef TCIFLUSH
-+#define TCIFLUSH 0
-+#endif
-+#ifndef tcflush
-+#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)
-+#endif
-+
-+#else /* !HAVE_TERMIO_H */
-+
-+#if __MINGW32__
-+
-+/* c_cc chars */
-+#define VINTR     0
-+#define VQUIT     1
-+#define VERASE    2
-+#define VKILL     3
-+#define VEOF      4
-+#define VTIME     5
-+#define VMIN      6
-+
-+/* c_iflag bits */
-+#define ISTRIP	0000040
-+#define INLCR	0000100
-+#define IGNCR	0000200
-+#define ICRNL	0000400
-+#define BRKINT	0000002
-+#define PARMRK	0000010
-+#define IXON	0002000
-+#define IGNBRK	0000001
-+#define IGNPAR	0000004
-+#define INPCK	0000020
-+#define IXOFF	0010000
-+
-+/* c_oflag bits */
-+#define OPOST	0000001
-+
-+/* c_cflag bit meaning */
-+#define CBAUD	   0010017
-+#define CSIZE	   0000060
-+#define CS8	   0000060
-+#define B0	   0000000
-+#define B50	   0000001
-+#define B75	   0000002
-+#define B110	   0000003
-+#define B134	   0000004
-+#define B150	   0000005
-+#define B200	   0000006
-+#define B300	   0000007
-+#define B600	   0000010
-+#define B1200	   0000011
-+#define B1800	   0000012
-+#define B2400	   0000013
-+#define B4800	   0000014
-+#define B9600	   0000015
-+#define CLOCAL	   0004000
-+#define CREAD	   0000200
-+#define CSTOPB	   0000100
-+#define HUPCL	   0002000
-+#define PARENB	   0000400
-+#define PARODD	   0001000
-+
-+/* c_lflag bits */
-+#define ECHO	0000010
-+#define ECHONL	0000100
-+#define ISIG	0000001
-+#define IEXTEN	0100000
-+#define ICANON	0000002
-+#define NOFLSH	0000200
-+#define ECHOE	0000020
-+#define ECHOK	0000040
-+
-+/* tcflush() */
-+#define	TCIFLUSH	0
-+
-+/* tcsetattr uses these */
-+#define	TCSADRAIN	1
-+
-+/* ioctls */
-+#define TCGETA		0x5405
-+#define TCFLSH		0x540B
-+#define TIOCGWINSZ	0x5413
-+
-+#ifndef cfgetospeed
-+#define cfgetospeed(t) ((t)->c_cflag & CBAUD)
-+#endif
-+
-+#ifndef tcsetattr
-+#define tcsetattr(fd, cmd, arg) _nc_mingw_ioctl(fd, cmd, arg)
-+#endif
-+
-+#ifndef tcgetattr
-+#define tcgetattr(fd, arg) _nc_mingw_ioctl(fd, TCGETA, arg)
-+#endif
-+
-+#ifndef tcflush
-+#define tcflush(fd, arg) _nc_mingw_ioctl(fd, TCFLSH, arg)
-+#endif
-+
-+#undef  ttyname
-+#define ttyname(fd) NULL
-+
-+#else
-+
-+#endif /* __MINGW32__ */
-+#endif /* HAVE_TERMIO_H */
-+
-+#endif /* HAVE_TERMIOS_H */
-+
-+#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-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.54 2012/07/14 21:03:29 tom Exp $
- ##############################################################################
--# 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
- BSD_TPUTS
- CC_HAS_PROTOS
-+CGETENT_CONST	/* nothing */
- CPP_HAS_PARAM_INIT
- CURSES_ACS_ARRAY	acs_map
- CURSES_WACS_ARRAY	_nc_wacs
-@@ -41,6 +42,7 @@
- ETIP_NEEDS_MATH_H
- GCC_NORETURN	/* nothing */
- GCC_UNUSED	/* nothing */
-+HAVE_ASSUME_DEFAULT_COLORS
- HAVE_BIG_CORE
- HAVE_BSD_CGETENT
- HAVE_BSD_SIGNAL_H
-@@ -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
- HAVE_SYS_BSDTYPES_H
-@@ -153,9 +161,12 @@
- HAVE_TYPEINFO
- HAVE_TYPE_ATTR_T
- HAVE_TYPE_SIGACTION
-+HAVE_UNCTRL_H	1
- HAVE_UNISTD_H
- HAVE_UNLINK
- HAVE_USE_DEFAULT_COLORS
-+HAVE_USE_SCREEN
-+HAVE_USE_WINDOW
- HAVE_VFSCANF
- HAVE_VSNPRINTF
- HAVE_VSSCANF
-@@ -176,6 +187,7 @@
- NCURSES_EXT_FUNCS
- NCURSES_NO_PADDING
- NCURSES_PATHSEP	':'
-+NCURSES_WIDECHAR
- NEED_PTEM_H
- 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 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,10 +31,10 @@
-  *                                                                          *
-  ****************************************************************************/
- 
--/* $Id: ncurses_mingw.h,v 1.1 2008/12/14 19:22:16 juergen Exp $ */
-+/* $Id: ncurses_mingw.h,v 1.2 2011/06/25 20:51:00 tom Exp $ */
- 
- /*
-- * This is a placholder up to now and describes what needs to be implemented
-+ * This is a placeholder up to now and describes what needs to be implemented
-  * to support I/O to external terminals with ncurses on the Windows OS.
-  */
- 
-@@ -67,98 +67,8 @@
-   speed_t    c_ospeed;    /* c_ospeed           */
- };
- 
--/* c_cc chars */
--#define VINTR     0
--#define VQUIT     1
--#define VERASE    2
--#define VKILL     3
--#define VEOF      4
--#define VTIME     5
--#define VMIN      6
--
--/* c_iflag bits */
--#define ISTRIP	0000040
--#define INLCR	0000100
--#define IGNCR	0000200
--#define ICRNL	0000400
--#define BRKINT	0000002
--#define PARMRK	0000010
--#define IXON	0002000
--#define IGNBRK	0000001
--#define IGNPAR	0000004
--#define INPCK	0000020
--#define IXOFF	0010000
--
--/* c_oflag bits */
--#define OPOST	0000001
--
--/* c_cflag bit meaning */
--#define CBAUD	   0010017
--#define CSIZE	   0000060
--#define CS8	   0000060
--#define B0	   0000000
--#define B50	   0000001
--#define B75	   0000002
--#define B110	   0000003
--#define B134	   0000004
--#define B150	   0000005
--#define B200	   0000006
--#define B300	   0000007
--#define B600	   0000010
--#define B1200	   0000011
--#define B1800	   0000012
--#define B2400	   0000013
--#define B4800	   0000014
--#define B9600	   0000015
--#define CLOCAL	   0004000
--#define CREAD	   0000200
--#define CSTOPB	   0000100
--#define HUPCL	   0002000
--#define PARENB	   0000400
--#define PARODD	   0001000
--
--/* c_lflag bits */
--#define ECHO	0000010
--#define ECHONL	0000100
--#define ISIG	0000001
--#define IEXTEN	0100000
--#define ICANON	0000002
--#define NOFLSH	0000200
--#define ECHOE	0000020
--#define ECHOK	0000040
--
--/* tcflush() */
--#define	TCIFLUSH	0
--
--/* tcsetattr uses these */
--#define	TCSADRAIN	1
--
--/* ioctls */
--#define TCGETA		0x5405
--#define TCFLSH		0x540B
--#define TIOCGWINSZ	0x5413
--
- extern int _nc_mingw_ioctl(int fd, long int request, struct termios* arg);
- extern void _nc_set_term_driver(void* term);
- 
--#ifndef cfgetospeed
--#define cfgetospeed(t) ((t)->c_cflag & CBAUD)
--#endif
--
--#ifndef tcsetattr
--#define tcsetattr(fd, cmd, arg) _nc_mingw_ioctl(fd, cmd, arg)
--#endif
--
--#ifndef tcgetattr
--#define tcgetattr(fd, arg) _nc_mingw_ioctl(fd, TCGETA, arg)
--#endif
--
--#ifndef tcflush
--#define tcflush(fd, arg) _nc_mingw_ioctl(fd, TCFLSH, arg)
--#endif
--
--#undef  ttyname
--#define ttyname(fd) NULL
--
--#endif
--#endif
-+#endif /* _NC_MINGWH */
-+#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-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-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                        1998-on                 *
-  ****************************************************************************/
- 
--/* $Id: term_entry.h,v 1.37 2009/07/11 16:52:29 tom Exp $ */
-+/* $Id: term_entry.h,v 1.41 2012/02/29 11:57:03 tom Exp $ */
- 
- /*
-  *	term_entry.h -- interface to entry-manipulation code
-@@ -47,6 +47,24 @@
- 
- #include <term.h>
- 
-+/* db_iterator.c */
-+typedef enum {
-+    dbdTIC = 0,
-+#if USE_DATABASE
-+    dbdEnvOnce,
-+    dbdHome,
-+    dbdEnvList,
-+    dbdCfgList,
-+    dbdCfgOnce,
-+#endif
-+#if USE_TERMCAP
-+    dbdEnvOnce2,
-+    dbdEnvList2,
-+    dbdCfgList2,
-+#endif
-+    dbdLAST
-+} DBDIRS;
-+
- #define MAX_USES	32
- #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-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-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,14 +33,14 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: tic.h,v 1.65 2009/08/08 17:52:46 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.
-  */
- 
- #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;
- extern NCURSES_EXPORT_VAR(int) _nc_syntax;
-+extern NCURSES_EXPORT_VAR(int) _nc_strict_bsd;
- extern NCURSES_EXPORT_VAR(long) _nc_comment_end;
- extern NCURSES_EXPORT_VAR(long) _nc_comment_start;
- extern NCURSES_EXPORT_VAR(long) _nc_curr_file_pos;
-@@ -314,23 +323,6 @@
- extern const char * _nc_progname;
- 
- /* db_iterator.c */
--typedef enum {
--    dbdTIC = 0,
--#if USE_DATABASE
--    dbdEnvOnce,
--    dbdHome,
--    dbdEnvList,
--    dbdCfgList,
--    dbdCfgOnce,
--#endif
--#if USE_TERMCAP
--    dbdEnvOnce2,
--    dbdEnvList2,
--    dbdCfgList2,
--#endif
--    dbdLAST
--} DBDIRS;
--
- extern NCURSES_EXPORT(const char *) _nc_next_db(DBDIRS *, int *);
- 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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 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_termcap.3x,v 1.26 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: curs_termcap.3x,v 1.27 2011/10/15 21:11:24 tom Exp $
- .TH curs_termcap 3X ""
- .na
- .hy 0
-@@ -77,9 +77,37 @@
- terminfo entry has been compiled.
- .PP
- The \fBtgetent\fR routine loads the entry for \fIname\fR.
--It returns 1 on success, 0 if there is no such entry, and \-1 if the
--terminfo database could not be found.
-+It returns:
-+.RS 3
-+.TP 3
-+1
-+on success,
-+.TP 3
-+0
-+if there is no such entry
-+(or that it is a generic type, having too little information for curses
-+applications to run), and
-+.TP 3
-+\-1
-+if the terminfo database could not be found.
-+.RE
-+.PP
-+This differs from the \fItermcap\fP library in two ways:
-+.RS 3
-+.TP 3
-+-
- The emulation ignores the buffer pointer \fIbp\fR.
-+The \fItermcap\fP library would store a copy of the terminal
-+description in the area referenced by this pointer.
-+However, ncurses stores its terminal descriptions in compiled
-+binary form, which is not the same thing.
-+.TP 3
-+-
-+There is a difference in return codes.
-+The \fItermcap\fP library does not check if the terminal
-+description is marked with the \fIgeneric\fP capability,
-+or if the terminal description has cursor-addressing.
-+.RE
- .PP
- The \fBtgetflag\fR routine gets the boolean entry for \fIid\fR,
- 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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 1999-2008,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1999-2010,2011 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_terminfo.3x,v 1.35 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: curs_terminfo.3x,v 1.36 2011/12/17 23:31:40 tom Exp $
- .TH curs_terminfo 3X ""
- .ds n 5
- .na
-@@ -346,7 +346,7 @@
- This implementation allows the caller to use \-1's for the old ordinates.
- In that case, the old location is unknown.
- .PP
--Extended terminal capability names, e.g., as defined by \fBtic\ \-x\fP,
-+Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP,
- are not stored in the arrays described in this section.
- .SH SEE ALSO
- \fBcurses\fR(3X),
-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) 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  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $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.36 2012/07/21 18:51:10 tom Exp $
- .TH curs_util 3X ""
- .de bP
- .IP \(bu 4
-@@ -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
- string capabilities which are defined in the terminfo entry via the \fB\-x\fP
--option of \fBtic\fP.
-+option of \fB@TIC@\fP.
- This implementation automatically assigns at run-time keycodes to 
- 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-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-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: infocmp.1m,v 1.46 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: infocmp.1m,v 1.51 2012/05/26 21:32:01 tom Exp $
- .TH @INFOCMP@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -37,10 +37,12 @@
- \fB@INFOCMP@\fR [\fB\-\
- 1\
- C\
-+D\
- E\
- F\
- G\
- I\
-+K\
- L\
- T\
- U\
-@@ -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
- \fB\-r\fR/when using \fB\-C\fR, put out all capabilities in \fBtermcap\fR form
-+\fB\-K\fR/modifies the \fB\-C\fP option, improving BSD-compatibility.
- .TE
- .PP
- If no \fItermnames\fR are given, the environment variable \fBTERM\fR will be
-@@ -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.
-+Normally you would use both the \fB\-C\fP and \fB\-r\fP options.
-+The actual format used incorporates some improvements for escaped characters
-+from terminfo format.
-+For a stricter BSD-compatible translation, use the \fB\-K\fR option
-+rather than \fB\-C\fP.
- .PP
- Note that because padding is collected to the beginning of the capability, not
--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
--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
-+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
- .TP 5
-+\fB\-0\fR
-+causes the fields to be printed on one line, without wrapping.
-+.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,
- the fields will be printed several to a line to a maximum width
- 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.
-+.TP
-+\fB\-D\fR
-+tells \fB@INFOCMP@\fP to print the database locations that it knows about, and exit.
- .TP 5
- \fB\-E\fR
- Dump the capabilities of the given terminal as tables, needed in
-@@ -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
- \fB\-t\fR
--tells \fBtic\fP to discard commented-out capabilities.
-+tells \fB@TIC@\fP to discard commented-out capabilities.
- Normally when translating from terminfo to termcap,
- untranslatable capabilities are commented-out.
- .TP 5
-@@ -385,13 +438,15 @@
- \fB\-x\fR
- print information for user-defined capabilities.
- These are extensions to the terminfo repertoire which can be loaded
--using the \fB\-x\fR option of \fBtic\fP.
-+using the \fB\-x\fR option of \fB@TIC@\fP.
- .SH FILES
- .TP 20
- \*d
- Compiled terminal description database.
- .SH EXTENSIONS
- The
-+\fB\-0\fR,
-+\fB\-1\fR,
- \fB\-E\fR,
- \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-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.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: ncurses.3x,v 1.103 2011/02/05 23:21:29 tom Exp $
-+.\" $Id: ncurses.3x,v 1.107 2012/07/14 21:13:06 tom Exp $
- .hy 0
- .TH ncurses 3X ""
- .de bP
-@@ -108,9 +108,9 @@
- .sp
- Before a \fBcurses\fR program is run, the tab stops of the terminal
- should be set and its initialization strings, if defined, must be output.
--This can be done by executing the \fBtput init\fR command
-+This can be done by executing the \fB@TPUT@ init\fR command
- after the shell environment variable \fBTERM\fR has been exported.
--\fBtset(1)\fR is usually responsible for doing this.
-+\fB@TSET@(1)\fR is usually responsible for doing this.
- [See \fBterminfo\fR(\*n) for further details.]
- .PP
- The \fBncurses\fR library permits manipulation of data structures,
-@@ -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.
- .PP
-+As a general rule, routines check for null pointers passed as parameters,
-+and handle this as an error.
-+.PP
- All macros return the value of the \fBw\fR version, except \fBsetscrreg\fR,
- \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.
- The return values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and
-@@ -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,
- ncurses checks for an extended terminfo capability \fBU8\fP.
--This is a numeric capability which can be compiled using \fBtic\ \-x\fP.
-+This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
- For example
- .RS 5
- .sp
-@@ -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
- a subdirectory named for the first letter of the terminal names therein.
-+.IP
-+If \fBncurses\fP is built with a hashed database,
-+then each entry in this list can also be the path of the corresponding
-+database file.
-+.IP
-+If \fBncurses\fP is built with a support for reading termcap files
-+directly, then an entry in this list may be the path of a termcap file.
- .TP 5
- TERMPATH
- If TERMCAP does not hold a file name then \fBncurses\fR checks
-@@ -1144,6 +1157,15 @@
- the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR
- sections of the library man pages.
- .PP
-+Unlike other implementations, this one checks parameters such as pointers
-+to WINDOW structures to ensure they are not null.
-+The main reason for providing this behavior is to guard against programmer
-+error.
-+The standard interface does not provide a way for the library
-+to tell an application which of several possible errors were detected.
-+Relying on this (or some other) extension will adversely affect the
-+portability of curses applications.
-+.PP
- This implementation also contains several extensions:
- .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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 2008-2009,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2008-2010,2011 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,19 +26,19 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tabs.1,v 1.8 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: tabs.1,v 1.9 2011/12/17 23:31:59 tom Exp $
- .TH @TABS@ 1 ""
- .ds n 5
- .SH NAME
--\fBtabs\fR \- set tabs on a terminal
-+\fB@TABS@\fR \- set tabs on a terminal
- .SH SYNOPSIS
--\fBtabs\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR
-+\fB@TABS@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR
- .br
- .SH DESCRIPTION
- .PP
--The \fBtabs\fP program clears and sets tab-stops on the terminal.
-+The \fB@TABS@\fP program clears and sets tab-stops on the terminal.
- This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities.
--If either is absent, \fBtabs\fP is unable to clear/set tab-stops.
-+If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops.
- The terminal should be configured to use hard tabs, e.g.,
- .sp
- .RS
-@@ -48,8 +48,8 @@
- .SS General Options
- .TP 5
- .BI \-T "name"
--Tell \fBtabs\fP which terminal type to use.
--If this option is not given, \fBtabs\fP will use the \fB$TERM\fP
-+Tell \fB@TABS@\fP which terminal type to use.
-+If this option is not given, \fB@TABS@\fP will use the \fB$TERM\fP
- environment variable.
- If that is not set, it will use the \fIansi+tabs\fP entry.
- .TP 5
-@@ -59,10 +59,10 @@
- The second data line shows the actual tab-stops, marked with asterisks.
- .TP 5
- .B \-n
--This option tells \fBtabs\fP to check the options and run any debugging
-+This option tells \fB@TABS@\fP to check the options and run any debugging
- option, but not to modify the terminal settings.
- .PP
--The \fBtabs\fP program processes a single list of tab stops.
-+The \fB@TABS@\fP program processes a single list of tab stops.
- The last option to be processed which defines a list is the one that
- determines the list to be processed.
- .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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 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: term.7,v 1.22 2010/12/04 18:41:07 tom Exp $
-+.\" $Id: term.7,v 1.23 2011/12/17 23:32:17 tom Exp $
- .TH term 7
- .ds n 5
- .ds d @TERMINFO@
-@@ -55,7 +55,7 @@
- are in fact using a VT100-superset console, terminal, or terminal emulator.)
- .PP
- In any case, you are free to override the system \fBTERM\fR setting to your
--taste in your shell profile.  The \fBtset\fP(1) utility may be of assistance;
-+taste in your shell profile.  The \fB@TSET@\fP(1) utility may be of assistance;
- you can give it a set of rules for deducing or requesting a terminal type based
- on the tty device and baud rate.
- .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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 2010 Free Software Foundation, Inc.                        *
-+.\" Copyright (c) 2010,2011 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: term_variables.3x,v 1.2 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: term_variables.3x,v 1.3 2011/12/17 23:31:50 tom Exp $
- .TH term_variables 3X ""
- .ds n 5
- .na
-@@ -110,7 +110,7 @@
- Alternatively, one can save the return value from \fBnewterm\fP
- or \fBsetupterm\fP to reuse in \fBset_term\fP.
- .SS Terminfo Names
--The \fBtic\fP(1) and \fBinfocmp\fP(1) programs use lookup tables for
-+The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for
- the long and short names of terminfo capabilities,
- 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-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.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.
-@@ -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
- set, it will interpret the contents of that variable as a list of colon-
--separated directories to be searched (an empty entry is interpreted as a
--command to search \fI\*d\fR).
-+separated directories (or database files) to be searched
-+(an empty entry is interpreted as a command to search \fI\*d\fR).
- If no description is found in any of the
- TERMINFO_DIRS directories, the fetch fails.
- .PP
-@@ -397,7 +412,7 @@
- .IP
- where c\di\u are conditions, b\di\u are bodies.
- .IP
--Use the \fB\-f\fP option of \fBtic\fP or \fB@INFOCMP@\fP to see
-+Use the \fB\-f\fP option of \fB@TIC@\fP or \fB@INFOCMP@\fP to see
- the structure of if-then-else's.
- Some strings, e.g., \fBsgr\fP can be very complicated when written
- on one line.
-@@ -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.
- This is normally used by the
--.IR tset
-+.IR @TSET@
- command to determine whether to set the mode for hardware tab expansion,
- 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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,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,19 +26,25 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.47 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: tic.1m,v 1.55 2012/03/24 21:21:05 tom Exp $
- .TH @TIC@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
-+.de bP
-+.IP \(bu 4
-+..
- .SH NAME
--\fBtic\fR \- the \fIterminfo\fR entry-description compiler
-+\fB@TIC@\fR \- the \fIterminfo\fR entry-description compiler
- .SH SYNOPSIS
--\fBtic\fR
-+\fB@TIC@\fR
- [\fB\-\
-+0\
- 1\
- C\
-+D\
- G\
- I\
-+K\
- L\
- N\
- T\
-@@ -61,31 +67,67 @@
- \fIfile\fR
- .br
- .SH DESCRIPTION
--The command \fBtic\fR translates a \fBterminfo\fR file from source
-+The \fB@TIC@\fR command translates a \fBterminfo\fR file from source
- format into compiled format.
- The compiled format is necessary for use with
- the library routines in \fBncurses\fR(3X).
- .PP
--The results are normally placed in the system terminfo
--directory \fB\*d\fR.
--There are two ways to change this behavior.
--.PP
--First, you may override the system default by setting the variable
--\fBTERMINFO\fR in your shell environment to a valid (existing) directory name.
--.PP
--Secondly, if \fBtic\fR cannot get access to \fI\*d\fR or your TERMINFO
--directory, it looks for the directory \fI$HOME/.terminfo\fR; if that directory
--exists, the entry is placed there.
--.PP
--Libraries that read terminfo entries are expected to check for a TERMINFO
--directory first, look at \fI$HOME/.terminfo\fR if TERMINFO is not set, and
--finally look in \fI\*d\fR.
-+As described in \fBterm\fR(\*n), the database may be either a directory
-+tree (one file per terminal entry) or a hashed database (one record per entry).
-+The \fB@TIC@\fR command writes only one type of entry,
-+depending on how it was built:
-+.bP
-+For directory trees, the top-level directory, e.g., /usr/share/terminfo,
-+specifies the location of the database.
-+.bP
-+For hashed databases, a filename is needed.
-+If the given file is not found by that name,
-+but can be found by adding the suffix ".db",
-+then that is used.
-+.IP
-+The default name for the hashed database is the same as the
-+default directory name (only adding a ".db" suffix).
-+.PP
-+In either case (directory or hashed database),
-+\fB@TIC@\fP will create the container if it does not exist.
-+For a directory, this would be the "terminfo" leaf,
-+versus a "terminfo.db" file.
-+.PP
-+The results are normally placed in the system terminfo database \fB\*d\fR.
-+The compiled terminal description can be placed
-+in a different terminfo database.
-+There are two ways to achieve this:
-+.bP
-+First, you may override the system default either by
-+using the \fB\-o\fP option,
-+or by setting the variable \fBTERMINFO\fR
-+in your shell environment to a valid database location.
-+.bP
-+Secondly, if \fB@TIC@\fR cannot write in \fI\*d\fR
-+or the location specified using your TERMINFO variable,
-+it looks for the directory \fI$HOME/.terminfo\fR
-+(or hashed database \fI$HOME/.terminfo.db)\fR;
-+if that location exists, the entry is placed there.
-+.PP
-+Libraries that read terminfo entries are expected to check for
-+.bP
-+a location specified with the TERMINFO variable first,
-+.bP
-+look in \fI$HOME/.terminfo\fR if TERMINFO is not set, next
-+.bP
-+directories listed in the TERMINFO_DIRS symbol, and
-+.bP
-+finally look in the system terminfo database (\fI\*d\fR).
-+.SS OPTIONS
-+.TP
-+\fB\-0\fR
-+restricts the output to a single line
- .TP
- \fB\-1\fR
- restricts the output to a single column
- .TP
- \fB\-a\fR
--tells \fBtic\fP to retain commented-out capabilities rather than discarding
-+tells \fB@TIC@\fP to retain commented-out capabilities rather than discarding
- them.
- Capabilities are commented by prefixing them with a period.
- This sets the \fB\-x\fR option, because it treats the commented-out
-@@ -101,16 +143,30 @@
- Capabilities
- that are not translatable are left in the entry under their terminfo names
- but commented out with two preceding dots.
-+The actual format used incorporates some improvements for escaped characters
-+from terminfo format.
-+For a stricter BSD-compatible translation, add the \fB\-K\fR option.
- .TP
- \fB\-c\fR
--tells \fBtic\fP to only check \fIfile\fR for errors, including syntax problems and
-+tells \fB@TIC@\fP to only check \fIfile\fR for errors, including syntax problems and
- bad use links.
- If you specify \fB\-C\fR (\fB\-I\fR) with this option, the code
- will print warnings about entries which, after use resolution, are more than
- 1023 (4096) bytes long.
--Due to a fixed buffer length in older termcap
--libraries (and a documented limit in terminfo), these entries may cause core
--dumps.
-+Due to a fixed buffer length in older termcap libraries,
-+as well as buggy checking for the buffer length
-+(and a documented limit in terminfo),
-+these entries may cause core
-+dumps with other implementations.
-+.TP
-+\fB\-D\fR
-+tells \fB@TIC@\fP to print the database locations that it knows about, and exit.
-+The first location shown is the one to which it would write compiled
-+terminal descriptions.
-+If \fB@TIC@\fP is not able to find a writable database location
-+according to the rules summarized above,
-+it will print a diagnostic and exit with an error rather than
-+printing a list of database locations.
- .TP
- \fB\-e \fR\fInames\fR
- Limit writes and translations to the following comma-separated list of
-@@ -137,6 +193,10 @@
- \fB\-I\fR
- Force source translation to terminfo format.
- .TP
-+\fB\-K\fR
-+Suppress some longstanding ncurses extensions to termcap format,
-+e.g., "\\s" for space.
-+.TP
- \fB\-L\fR
- Force source translation to terminfo format
- using the long C variable names listed in <\fBterm.h\fR>
-@@ -155,9 +215,8 @@
- obsolete capabilities.
- .TP
- \fB\-o\fR\fIdir\fR
--Write compiled entries to given directory.
--Overrides the TERMINFO environment
--variable.
-+Write compiled entries to given database location.
-+Overrides the TERMINFO environment variable.
- .TP
- \fB\-R\fR\fIsubset\fR
- Restrict output to a given subset.
-@@ -177,7 +236,7 @@
- tc capabilities per entry.
- .TP
- \fB\-s\fR
--Summarize the compile by showing the directory into which entries
-+Summarize the compile by showing the database location into which entries
- are written, and the number of entries which are compiled.
- .TP
- \fB\-T\fR
-@@ -186,12 +245,12 @@
- descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo).
- .TP
- \fB\-t\fR
--tells \fBtic\fP to discard commented-out capabilities.
-+tells \fB@TIC@\fP to discard commented-out capabilities.
- Normally when translating from terminfo to termcap,
- untranslatable capabilities are commented-out.
- .TP 5
- \fB\-U\fR
--tells \fBtic\fP to not post-process the data after parsing the source file.
-+tells \fB@TIC@\fP to not post-process the data after parsing the source file.
- Normally, it infers data which is commonly missing in older terminfo data,
- or in termcaps.
- .TP
-@@ -200,31 +259,13 @@
- .TP
- \fB\-v\fR\fIn\fR
- specifies that (verbose) output be written to standard error trace
--information showing \fBtic\fR's progress.
-+information showing \fB@TIC@\fR's progress.
- The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
- indicating the desired level of detail of information.
- If \fIn\fR is omitted, the default level is 1.
- 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
-@@ -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
--All but one of the capabilities recognized by \fBtic\fR are documented
-+All but one of the capabilities recognized by \fB@TIC@\fR are documented
- in \fBterminfo\fR(\*n).
- The exception is the \fBuse\fR capability.
- .PP
- When a \fBuse\fR=\fIentry\fR\-\fIname\fR field is discovered in a
--terminal entry currently being compiled, \fBtic\fR reads in the binary
-+terminal entry currently being compiled, \fB@TIC@\fR reads in the binary
- from \fB\*d\fR to complete the entry.
- (Entries created from
- \fIfile\fR will be used first.
- If the environment variable
--\fBTERMINFO\fR is set, that directory is searched instead of
--\fB\*d\fR.)  \fBtic\fR duplicates the capabilities in
-+\fBTERMINFO\fR is set, that database location is searched instead of
-+\fB\*d\fR.)  \fB@TIC@\fR duplicates the capabilities in
- \fIentry\fR\-\fIname\fR for the current entry, with the exception of
- those capabilities that explicitly are defined in the current entry.
- .PP
-@@ -272,9 +338,6 @@
- \fBentry_name_1\fR before \fBuse=\fR for these capabilities to be
- canceled in \fBentry_name_1\fR.
- .PP
--If the environment variable \fBTERMINFO\fR is set, the compiled
--results are placed there instead of \fB\*d\fR.
--.PP
- Total compiled entries cannot exceed 4096 bytes.
- The name field cannot
- exceed 512 bytes.
-@@ -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.
- .SH COMPATIBILITY
--There is some evidence that historic \fBtic\fR implementations treated
-+There is some evidence that historic \fB@TIC@\fR implementations treated
- description fields with no whitespace in them as additional aliases or
- short names.
--This \fBtic\fR does not do that, but it does warn when
-+This \fB@TIC@\fR does not do that, but it does warn when
- description fields may be treated that way and check them for dangerous
- characters.
- .SH EXTENSIONS
--Unlike the stock SVr4 \fBtic\fR command, this implementation can actually
-+Unlike the stock SVr4 \fB@TIC@\fR command, this implementation can actually
- compile termcap sources.
- In fact, entries in terminfo and termcap syntax can
- be mixed in a single source file.
-@@ -298,16 +361,20 @@
- .PP
- The SVr4 manual pages are not clear on the resolution rules for \fBuse\fR
- capabilities.
--This implementation of \fBtic\fR will find \fBuse\fR targets anywhere
-+This implementation of \fB@TIC@\fR will find \fBuse\fR targets anywhere
- in the source file, or anywhere in the file tree rooted at \fBTERMINFO\fR (if
--\fBTERMINFO\fR is defined), or in the user's \fI$HOME/.terminfo\fR directory
--(if it exists), or (finally) anywhere in the system's file tree of
-+\fBTERMINFO\fR is defined),
-+or in the user's \fI$HOME/.terminfo\fR database
-+(if it exists),
-+or (finally) anywhere in the system's file tree of
- compiled entries.
- .PP
--The error messages from this \fBtic\fR have the same format as GNU C
-+The error messages from this \fB@TIC@\fR have the same format as GNU C
- error messages, and can be parsed by GNU Emacs's compile facility.
- .PP
- The
-+\fB\-0\fR,
-+\fB\-1\fR,
- \fB\-C\fR,
- \fB\-G\fR,
- \fB\-I\fR,
-@@ -329,7 +396,7 @@
- The SVr4 \fB\-c\fR mode does not report bad use links.
- .PP
- System V does not compile entries to or read entries from your
--\fI$HOME/.terminfo\fR directory unless TERMINFO is explicitly set to it.
-+\fI$HOME/.terminfo\fR database unless TERMINFO is explicitly set to it.
- .SH FILES
- .TP 5
- \fB\*d/?/*\fR
-@@ -340,6 +407,7 @@
- \fB@INFOTOCAP@\fR(1M),
- \fB@TOE@\fR(1M),
- \fBcurses\fR(3X),
-+\fBterm\fR(\*n).
- \fBterminfo\fR(\*n).
- .PP
- 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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 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,19 +26,19 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: toe.1m,v 1.23 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp $
- .TH @TOE@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
--\fBtoe\fR \- table of (terminfo) entries
-+\fB@TOE@\fR \- table of (terminfo) entries
- .SH SYNOPSIS
--\fBtoe\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR
-+\fB@TOE@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahsuUV\fR] \fIfile...\fR
- .br
- .SH DESCRIPTION
- .PP
- With no options,
--\fBtoe\fR lists all available terminal types by primary name
-+\fB@TOE@\fR lists all available terminal types by primary name
- with descriptions.
- File arguments specify the directories to be scanned; if no
- such arguments are given,
-@@ -52,6 +52,15 @@
- \fB\-a\fR
- report on all of the terminal databases which ncurses would search,
- rather than only the first one that it finds.
-+.IP
-+If the \fB\-s\fR is also given, \fB@TOE@\fR
-+adds a column to the report,
-+showing (like \fBconflict\fP(1)) which entries which 
-+belong to a given terminal database.
-+An "*" marks entries which differ, and "+" marks equivalent entries.
-+.TP
-+\fB\-s\fR
-+sort the output by the entry names.
- .TP
- \fB\-u\fR \fIfile\fR
- says to write a report to the standard output,
-@@ -78,7 +87,7 @@
- .TP
- \fB\-v\fR\fIn\fR
- specifies that (verbose) output be written to standard error,
--showing \fBtoe\fR's progress.
-+showing \fB@TOE@\fR's progress.
- The optional parameter \fIn\fR is a number from 1 to 10,
- interpreted as for \fB@TIC@\fR(1M).
- .TP
-diff -Naur ncurses-5.9.orig/man/tput.1 ncurses-5.9/man/tput.1
---- 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-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: tput.1,v 1.29 2010/12/04 18:41:07 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
-@@ -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
- same effect as \fB@TPUT@ reset\fR.
--See \fBtset\fR for comparison, which has similar behavior.
-+See \fB@TSET@\fR for comparison, which has similar behavior.
- .SH EXAMPLES
- .TP 5
- \fB@TPUT@ init\fR
-@@ -275,7 +276,7 @@
- .PP
- Any other exit code indicates an error; see the DIAGNOSTICS section.
- .SH DIAGNOSTICS
--\fBtput\fR prints the following error messages and sets the corresponding exit
-+\fB@TPUT@\fR prints the following error messages and sets the corresponding exit
- codes.
- .PP
- .ne 15
-@@ -303,17 +304,29 @@
- .PP
- X/Open documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
- In this implementation, \fBclear\fP is part of the \fIcapname\fR support.
--Other implementations of \fBtput\fP on
-+Other implementations of \fB@TPUT@\fP on
- SVr4-based systems such as Solaris, IRIX64 and HPUX
- as well as others such as AIX and Tru64
- provide support for \fIcapname\fR operands.
-+.PP
- A few platforms such as FreeBSD and NetBSD recognize termcap names rather
--than terminfo capability names in their respective \fBtput\fP commands.
-+than terminfo capability names in their respective \fB@TPUT@\fP commands.
-+.PP
-+Most implementations which provide support for \fIcapname\fR operands
-+use the \fItparm\fP function to expand parameters in it.
-+That function expects a mixture of numeric and string parameters,
-+requiring \fB@TPUT@\fP to know which type to use.
-+This implementation uses a table to determine that for
-+the standard \fIcapname\fR operands, and an internal library
-+function to analyze nonstandard \fIcapname\fR operands.
-+Other implementations may simply guess that an operand containing only digits
-+is intended to be a number.
- .SH SEE ALSO
- \fB@CLEAR@\fR(1),
- \fBstty\fR(1),
- \fBtabs\fR(\*n),
--\fBterminfo\fR(5).
-+\fBterminfo\fR(5),
-+\fBcurs_termcap\fR(3X).
- .PP
- This describes \fBncurses\fR
- 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-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 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2011 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,12 +26,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tset.1,v 1.25 2010/12/04 18:38:55 tom Exp $
-+.\" $Id: tset.1,v 1.27 2011/12/17 23:20:35 tom Exp $
- .TH @TSET@ 1 ""
- .SH NAME
--\fBtset\fR, \fBreset\fR \- terminal initialization
-+\fB@TSET@\fR, \fBreset\fR \- terminal initialization
- .SH SYNOPSIS
--\fBtset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
-+\fB@TSET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
- .br
- \fBreset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
- .SH DESCRIPTION
-@@ -72,7 +72,7 @@
- versus the other initialization.
- If neither option is given, both are assumed.
- .PP
--When invoked as \fBreset\fR, \fBtset\fR sets cooked and echo modes,
-+When invoked as \fBreset\fR, \fB@TSET@\fR sets cooked and echo modes,
- turns off cbreak and raw modes, turns on newline translation and
- resets any unset special characters to their default values before
- doing the terminal initialization described above.  This is useful
-@@ -89,6 +89,7 @@
- .TP 5
- .B \-c
- Set control characters and modes.
-+.TP 5
- .B \-e
- Set the erase character to \fIch\fR.
- .TP
-@@ -109,7 +110,7 @@
- .TP
- .B \-Q
- Do not display any values for the erase, interrupt and line kill characters.
--Normally \fBtset\fR displays the values for control characters which
-+Normally \fB@TSET@\fR displays the values for control characters which
- differ from the system's default values.
- .TP
- .B \-q
-@@ -152,19 +153,19 @@
- \fBnoglob\fR, leaving it unset.  The following line in the \fB.login\fR
- or \fB.profile\fR files will initialize the environment correctly:
- .sp
--    eval \`tset \-s options ... \`
-+    eval \`@TSET@ \-s options ... \`
- .
- .SH TERMINAL TYPE MAPPING
- When the terminal is not hardwired into the system (or the current
- system information is incorrect) the terminal type derived from the
- \fI/etc/ttys\fR file or the \fBTERM\fR environmental variable is often
- something generic like \fBnetwork\fR, \fBdialup\fR, or \fBunknown\fR.
--When \fBtset\fR is used in a startup script it is often desirable to
-+When \fB@TSET@\fR is used in a startup script it is often desirable to
- provide information about the type of terminal used on such ports.
- .PP
- The purpose of the \fB\-m\fR option is to map
- from some set of conditions to a terminal type, that is, to
--tell \fBtset\fR
-+tell \fB@TSET@\fR
- ``If I'm on this port at a particular speed, guess that I'm on that
- kind of terminal''.
- .PP
-@@ -207,20 +208,20 @@
- and that \fBcsh\fR users insert a backslash character (``\e'') before
- any exclamation marks (``!'').
- .SH HISTORY
--The \fBtset\fR command appeared in BSD 3.0.  The \fBncurses\fR implementation
-+The \fB@TSET@\fR command appeared in BSD 3.0.  The \fBncurses\fR implementation
- was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
- S. Raymond <esr@snark.thyrsus.com>.
- .SH COMPATIBILITY
--The \fBtset\fR utility has been provided for backward-compatibility with BSD
-+The \fB@TSET@\fR utility has been provided for backward-compatibility with BSD
- environments (under most modern UNIXes, \fB/etc/inittab\fR and \fIgetty\fR(1)
- can set \fBTERM\fR appropriately for each dial-up line; this obviates what was
--\fBtset\fR's most important use).  This implementation behaves like 4.4BSD
-+\fB@TSET@\fR's most important use).  This implementation behaves like 4.4BSD
- tset, with a few exceptions specified here.
- .PP
- The \fB\-S\fR option of BSD tset no longer works; it prints an error message to stderr
- and dies.  The \fB\-s\fR option only sets \fBTERM\fR, not \fBTERMCAP\fP.  Both these
- changes are because the \fBTERMCAP\fR variable is no longer supported under
--terminfo-based \fBncurses\fR, which makes \fBtset \-S\fR useless (we made it die
-+terminfo-based \fBncurses\fR, which makes \fB@TSET@ \-S\fR useless (we made it die
- noisily rather than silently induce lossage).
- .PP
- There was an undocumented 4.4BSD feature that invoking tset via a link named
-@@ -228,7 +229,7 @@
- terminal to use upper-case only.  This feature has been omitted.
- .PP
- The \fB\-A\fR, \fB\-E\fR, \fB\-h\fR, \fB\-u\fR and \fB\-v\fR
--options were deleted from the \fBtset\fR
-+options were deleted from the \fB@TSET@\fR
- utility in 4.4BSD.
- None of them were documented in 4.3BSD and all are
- of limited utility at best.
-@@ -243,14 +244,14 @@
- arguments, although it is strongly recommended that such usage be fixed to
- explicitly specify the character.
- .PP
--As of 4.4BSD, executing \fBtset\fR as \fBreset\fR no longer implies the \fB\-Q\fR
-+As of 4.4BSD, executing \fB@TSET@\fR as \fBreset\fR no longer implies the \fB\-Q\fR
- option.  Also, the interaction between the \- option and the \fIterminal\fR
--argument in some historic implementations of \fBtset\fR has been removed.
-+argument in some historic implementations of \fB@TSET@\fR has been removed.
- .SH ENVIRONMENT
--The \fBtset\fR command uses these environment variables:
-+The \fB@TSET@\fR command uses these environment variables:
- .TP 5
- SHELL
--tells \fBtset\fP whether to initialize \fBTERM\fP using \fBsh\fP or
-+tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP or
- \fBcsh\fP syntax.
- .TP 5
- TERM
-@@ -260,7 +261,7 @@
- TERMCAP
- may denote the location of a termcap database.
- If it is not an absolute pathname, e.g., begins with a `/',
--\fBtset\fP removes the variable from the environment before looking
-+\fB@TSET@\fP removes the variable from the environment before looking
- for the terminal description.
- .SH FILES
- .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-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 $
-+# $Id: Makefile.in,v 1.55 2011/08/07 15:46:50 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 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"), #
-@@ -102,6 +102,7 @@
- SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
- 
-+RPATH_LIST	= @RPATH_LIST@
- MK_SHARED_LIB	= @MK_SHARED_LIB@
- 
- NCURSES_MAJOR	= @NCURSES_MAJOR@
-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-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_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.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;
-     }
- 
--  if (E_OK == result)
-+  if (item == 0)
-+    {
-+      result = E_BAD_STATE;
-+    }
-+  else if (E_OK == result)
-     {
-       /* 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-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.60 2012/08/11 21:31:56 tom Exp $
- ##############################################################################
--# 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"), #
-@@ -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 :
- 	WHICH_XTERM=@WHICH_XTERM@ \
--	ticdir=${ticdir} \
-+	XTERM_KBS=@XTERM_KBS@ \
-+	datadir=${datadir} \
- 	$(SHELL) $(srcdir)/gen_edit.sh >$@
- 
- $(DESTDIR)$(bindir) \
-@@ -139,7 +141,7 @@
- 
- uninstall.libs :
- 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
--@MAKE_PC_FILES@	$(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
-+@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
- 
- tags :
- 
-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-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@
--# $Id: gen-pkgconfig.in,v 1.8 2010/02/06 22:12:07 Miroslav.Lichvar Exp $
-+# $Id: gen-pkgconfig.in,v 1.14 2012/01/01 01:48:23 tom Exp $
- ##############################################################################
--# Copyright (c) 2009,2010 Free Software Foundation, Inc.                     #
-+# Copyright (c) 2009-2010,2011 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 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey, 2009
-+# Author: Thomas E. Dickey
- #
- # The complete configure script for ncurses is the ncurses5-config (or similar
- # name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc).
-@@ -63,63 +63,48 @@
- MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
- FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
- 
--SUB_LIBRARY_REQ=${SUB_LIBRARY}
--if test $TINFO_NAME = $LIB_NAME ; then
--	SUB_LIBRARY_REQ=
-+if test "$includedir" = "/usr/include" ; then
-+	CFLAGS=
-+else
-+	CFLAGS="-I\${includedir}"
- fi
- 
--for lib in ../lib/*
--do
--	name=`basename $lib`
--	if test "$name" = "*" ; then
--		break
--	fi
--
--	root=`basename $name "$DFT_DEP_SUFFIX"`
--	if test "$name" = "$root" ; then
--		root=`basename $name "$CXX_LIB_SUFFIX"`
--		if test "$name" = "$root" ; then
--			continue
--		fi
--	fi
-+if test "$libdir" = "/usr/lib" ; then
-+	LDFLAGS=
-+else
-+	LDFLAGS="-L\${libdir}"
-+fi
- 
--	name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
-+for name in @PC_MODULES_TO_MAKE@
-+do
-+	name="${name}"
- 
- 	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
-+	reqs=
-+
- 	if test $name = $MAIN_LIBRARY ; then
--		reqs=$SUB_LIBRARY_REQ
- 		desc="$desc library"
- 	elif test $name = $SUB_LIBRARY ; then
--		reqs=
- 		desc="$desc terminal interface library"
- 	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
--		reqs="$PANEL_LIBRARY $MENU_LIBRARY $FORM_LIBRARY $MAIN_LIBRARY $SUB_LIBRARY_REQ"
-+		reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY"
- 		desc="$desc add-on library"
- 	else
--		reqs="$MAIN_LIBRARY $SUB_LIBRARY_REQ"
-+		reqs="$MAIN_LIBRARY"
- 		desc="$desc add-on library"
- 	fi
- 
--	if test "$includedir" = "/usr/include" ; then
--		cflags=
--	else
--		cflags="-I\${includedir}"
--	fi
--
--	if test "$libdir" = "/usr/lib" ; then
--		libs=
--	else
--		libs="-L\${libdir}"
--	fi
--	libs="$libs -l$name"
--
--	# add dependencies that pkg-config cannot guess about
--	if test -z "$reqs" ; then
--		libs="$libs @LIBS@"
-+	if test $name != $SUB_LIBRARY && test $SUB_LIBRARY != $MAIN_LIBRARY ; then
-+		if test $name != $TINFO_NAME ; then
-+			test -n "$reqs" && reqs="$reqs, "
-+			reqs="${reqs}${SUB_LIBRARY}"
-+		fi
- 	fi
- 
- 	echo "** creating ${name}.pc"
- 	cat >${name}.pc <<EOF
-+# vile:makemode
-+
- prefix=$show_prefix
- exec_prefix=$show_exec_prefix
- libdir=$show_libdir
-@@ -130,10 +115,13 @@
- Name: $name
- Description: $desc
- Version: \${version}
--Requires: $reqs
--Libs: $libs
--Cflags: $cflags
-+URL: http://invisible-island.net/ncurses
-+Requires.private: $reqs
-+Libs: $LDFLAGS -l$name
-+Libs.private: @LIBS@
-+Cflags: $CFLAGS
- EOF
--	# pr -f ${name}.pc
-+
-+	#pr -f ${name}.pc
- done
- # 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-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
- ##############################################################################
--# Copyright (c) 2004 Free Software Foundation, Inc.                          #
-+# Copyright (c) 2004-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"), #
-@@ -29,7 +29,7 @@
- #
- # Author: Thomas E. Dickey
- #
--# $Id: gen_edit.sh,v 1.1 2004/07/11 15:01:29 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,22 +37,82 @@
- #	The leaf directory names (lib, tabset, terminfo)
- #
- 
--: ${ticdir=@TERMINFO@}
--: ${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
- # of the tabset files in terminfo.src (which are in a parallel directory).
--TABSET=`echo $ticdir | sed -e 's%/terminfo$%/tabset%'`
-+TABSET=${datadir}/tabset
- if test "x$TABSET" != "x/usr/share/tabset" ; then
- cat <<EOF
- s%/usr/share/tabset%$TABSET%g
- 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
-+echo "** using DEL for XTerm backspace-key" >&2
-+cat <<EOF
-+/^xterm+kbs|fragment for backspace key/,/^#/{
-+	s/kbs=^H,/kbs=^?,/
-+}
-+EOF
-+fi
-+
-+# 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.  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
-+echo "** using $WHICH_LINUX terminal description for Linux console" >&2
-+cat <<EOF
-+/^# This is Linux console for ncurses/,/^$/{
-+	s/use=$linux_dft,/use=$WHICH_LINUX,/
-+}
-+EOF
-+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-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.28 2012/08/11 21:45:20 tom Exp $
- ##############################################################################
- # Copyright (c) 2006-2010,2011 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -36,11 +36,13 @@
- bindir="@bindir@"
- includedir="@includedir@"
- libdir="@libdir@"
-+datarootdir="@datarootdir@"
- datadir="@datadir@"
- mandir="@mandir@"
- 
- THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
- TINFO_LIB="@TINFO_ARG_SUFFIX@"
-+RPATH_LIST="@RPATH_LIST@"
- 
- LANG=C;		export LANG
- LANGUAGE=C;	export LANGUAGE
-@@ -83,13 +85,19 @@
- ENDECHO
- 		;;
- 	--libs)
-+		if test "$libdir" = /usr/lib
-+		then
-+			LIBDIR=
-+		else
-+			LIBDIR=-L$libdir
-+		fi
- 		if test @TINFO_NAME@ = @LIB_NAME@ ; then
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-+			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
- ENDECHO
- 		else
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
-+			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
- ENDECHO
- 		fi
- 		;;
-@@ -163,4 +171,5 @@
- 	esac
- 	shift
- done
-+# 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-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
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.383 $
--#	$Date: 2011/02/20 20:46:53 $
-+#	$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
-@@ -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,
- 
- #### ANSI console types
--#
- 
--#############################################################################
- #
- # Atari ST terminals.
- # From Guido Flohr <gufl0000@stud.uni-sb.de>.
-@@ -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,
- 	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7,
--	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-+	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
- 	smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g,
- 	vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr,
- 	use=ecma+color,
-@@ -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.
- # reported by Frank Heckenbach <frank@g-n-u.de>.
--linux|linux console,
-+linux2.2|linux 2.2.x console,
- 	civis=\E[?25l\E[?1c, cnorm=\E[?25h\E[?0c,
- 	cvvis=\E[?25h\E[?8c, use=linux-c-nc,
- 
-+# Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here:
-+#	http://lkml.indiana.edu/hypermail/linux/kernel/0602.2/0868.html
-+# 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,
-+	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
-+	sgr0=\E[m\017, smacs=^N, use=linux2.2,
-+
-+# 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,
-+
-+# This is Linux console for ncurses.
-+linux|linux console,
-+	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 +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
- linux2.6.26|linux console w/o bce,
--	bce@, use=linux,
-+	bce@, use=linux2.6,
- 
- # 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,
-@@ -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,
- 
-+# From: Samuel Thibault
-+# Source: git://git.sv.gnu.org/hurd/gnumach.git
-+# Files: i386/i386at/kd.c
-+#
-+# Added nel, hpa, sgr and removed rmacs, smacs based on source -TD
-+mach-gnu|GNU Mach,
-+	acsc=+>\,<-\^.v0\333`+a\261f\370g\361h\260i#j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
-+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
-+	el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
-+	indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT,
-+	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,
-+	use=mach,
-+
-+mach-gnu-color|Mach Console with ANSI color,
-+	colors#8, pairs#64,
-+	op=\E[37;40m, rmso=\E[27m, setab=\E[4%p1%dm,
-+	setaf=\E[3%p1%dm, use=mach-gnu,
-+
- # From: Marcus Brinkmann
- # http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/hurd/hurd/console/
- #
-@@ -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,
- 
-+#### OpenBSD consoles
-+#
-+# From: Alexei Malinin <Alexei.Malinin@mail.ru>; October, 2011.
-+#
-+# The following terminal descriptions for the  AMD/Intel PC console
-+# were prepared  based on information contained in  the OpenBSD-4.9
-+# termtypes.master and wscons(4) & vga(4) manuals (2010, November).
-+#
-+# Added bce based on testing with tack -TD
-+# Added several capabilities to pccon+base, reading wsemul_vt100_subr.c -TD
-+# Changed kbs to DEL and removed keys that duplicate stty settings -TD
-+#
-+pccon+keys|OpenBSD PC keyboard keys,
-+	kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-+	kdch1=\E[3~, kend=\E[8~, kent=^M, 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~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-+	krfr=^R,
-+pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
-+	acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o,
-+	sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-+pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
-+	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-+	enacs=\E)0$<5>, rmacs=\E(B$<5>,
-+	sgr=\E[0%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<5>,
-+	sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>,
-+pccon+colors|ANSI colors for OpenBSD PC console,
-+	bce,
-+	colors#8, pairs#64,
-+	op=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+pccon+base|base capabilities for OpenBSD PC console,
-+	am, km, mc5i, msgr, npc, nxon, xenl, xon,
-+	cols#80, it#8, lines#24,
-+	bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C,
-+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
-+	dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-+	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
-+	il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l,
-+	rmso=\E[m, rs2=\Ec$<50>, smam=\E[?7h, smso=\E[7m,
-+	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
-+pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
-+	use=pccon+base, use=pccon+sgr+acs0, use=pccon+keys,
-+pccon0|OpenBSD PC console with simple ASCII pseudographics,
-+	use=pccon0-m, use=pccon+colors,
-+pccon-m|OpenBSD PC console without colors,
-+	use=pccon+base, use=pccon+sgr+acs, use=pccon+keys,
-+pccon|OpenBSD PC console,
-+	use=pccon-m, use=pccon+colors,
-+
- #### NetBSD consoles
- #
- # pcvt termcap database entries (corresponding to release 3.31)
-@@ -1786,7 +1881,7 @@
- ofcons|DNARD OpenFirmware console,
- 	bw,
- 	cols#80, lines#30,
--	bel=^G, blink=\2337;2m, bold=\2331m, clear=^L, cr=^M,
-+	bel=^G, blink=\2335m, bold=\2331m, clear=^L, cr=^M,
- 	cub=\233%p1%dD, cub1=\233D, cud=\233%p1%dB, cud1=\233B,
- 	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 +1893,8 @@
- 	kf4=\2330x, kf5=\2330t, kf6=\2330u, kf7=\2330q, kf8=\2330r,
- 	kf9=\2330p, knp=\233/, kpp=\233?, nel=^M^J, rev=\2337m,
- 	rmso=\2330m, rmul=\2330m,
--	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
--	sgr0=\2330m,
-+	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t2%;%?%p7%t8%;%?%p1%p3%|%t;7%;m,
-+	sgr0=\2330m, smso=\2337m, smul=\2334m,
- 
- # NetBSD "wscons" emulator in vt220 mode.
- # This entry is based on the NetBSD termcap entry, correcting the ncv value.
-@@ -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,
- 
-+# Unlike xterm-sco, this leaves kmous ambiguous with kf1.
-+#
-+# Use modifiers to obtain function keys past 12:
-+# F1-F12 - normal
-+# F13-F24 - shift
-+# F25-F36 - control/alt
-+# F37-F48 - control/shift
-+#
-+putty-sco|putty with SCO function keys,
-+	kbeg=\E[E, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-+	kdch1=\177, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
-+	kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b,
-+	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
-+	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
-+	kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O,
-+	kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t,
-+	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
-+	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
-+	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
-+	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
-+	kich1=\E[L, knp=\E[G, kpp=\E[I, use=putty,
-+
- # This entry is for Tera Term Pro version 2.3, for MS-Windows 95/NT written by
- # T. Teranishi dated Mar 10, 1998.  It is a free software terminal emulator
- # (communication program) which supports:
-@@ -3091,7 +3175,8 @@
- 	kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m, smkx=\E[?1h\E,
- 	smso=\E[7m,
- 
--#### X terminal emulators
-+######## X TERMINAL EMULATORS
-+#### XTERM
- #
- # You can add the following line to your .Xdefaults to change the terminal type
- # set by the xterms you start up to my-xterm:
-@@ -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,
- 	npc,
--	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
--	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
--	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
--	kend=\EOF, kent=\EOM, khome=\EOH, kich1=\E[2~, kmous=\E[M,
--	knp=\E[6~, kpp=\E[5~, rin=\E[%p1%dT, use=xterm+pcfkeys,
-+	indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
-+	rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm+tmux,
- 	use=xterm-basic,
-+
-+# This fragment is for people who cannot agree on what the backspace key
-+# should send.
-+xterm+kbs|fragment for backspace key,
-+	kbs=^H,
- #
- # This fragment describes as much of XFree86 xterm's "pc-style" function
- # keys as will fit into terminfo's 60 function keys.
-@@ -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, 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, 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 +3617,28 @@
- xterm-1003|testing xterm-mouse,
- 	XM=\E[?1003%?%p1%{1}%=%th%el%;, use=xterm-new,
- 
-+# This chunk is based on suggestions by Ailin Nemui and Nicholas Marriott, who
-+# asked for some of xterm's advanced features to be added to its terminfo
-+# entry.  It defines extended capabilities not found in standard terminfo or
-+# termcap.  These are useful in tmux, for instance, hence the name.
-+#
-+# One caveat in adding extended capabilities in ncurses is that if the names
-+# are longer than two characters, then they will not be visible through the
-+# termcap interface.
-+#
-+# Ms modifies the selection/clipboard.  Its parameters are
-+#	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 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,
-+	Ms=\E]52;%p1%s;%p2%s\007, Se=\E[2 q, Ss=\E[%p1%d q,
-+
- # This is another variant, for XFree86 4.0 xterm (T.Dickey)
- # 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 +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,
- 	is2=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8,
--	ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kbs=^H,
--	kc1=\217q, kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B,
-+	ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kc1=\217q,
-+	kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B,
- 	kcuf1=\217C, kcuu1=\217A, kdch1=\2333~, kend=\2334~,
- 	kent=\217M, kf1=\23311~, kf10=\23321~, kf11=\23323~,
- 	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
-@@ -3575,6 +3687,7 @@
- 	smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=,
- 	smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR,
- 	u7=\E[6n, u8=\233[?1;2c, u9=\E[c, vpa=\233%i%p1%dd,
-+	use=xterm+kbs,
- 
- xterm-hp|xterm with hpterm function keys,
- 	kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-@@ -3621,8 +3734,9 @@
- 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- 	bel=^G, clear=\EH\EJ, cr=^M, cub1=\ED, cud1=\EB, cuf1=\EC,
- 	cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK,
--	home=\EH, ht=^I, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB,
--	kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF,
-+	home=\EH, ht=^I, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-+	kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF,
-+	use=xterm+kbs,
- 
- xterm-noapp|xterm with cursor keys in normal mode,
- 	rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp,
-@@ -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,
-+
-+# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
-+xterm-nic|xterm with ich/ich1 suppressed for non-curses programs,
-+	ich@, ich1@, use=xterm,
-+# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996
-+xterm1|xterm terminal emulator ignoring the alternate screen buffer,
-+	rmcup@, smcup@, use=xterm,
-+
-+#### KTERM
- # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
- # (kterm should not invoke DEC Graphics as the alternate character set
- #  -- Kenji Rikitake)
-@@ -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,
- 	ncv@, use=kterm, use=ecma+color,
--# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
--xterm-nic|xterm with ich/ich1 suppressed for non-curses programs,
--	ich@, ich1@, use=xterm,
--# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996
--xterm1|xterm terminal emulator ignoring the alternate screen buffer,
--	rmcup@, smcup@, use=xterm,
-+
-+#### Other XTERM
-+# These (xtermc and xtermm) are distributed with Solaris.  They refer to a
-+# variant of xterm which is apparently no longer supported, but are interesting
-+# because they illustrate SVr4 curses mouse controls - T.Dickey
-+xtermm|xterm terminal emulator (monocrome),
-+	OTbs, am, km, mir, msgr, xenl,
-+	btns#3, cols#80, it#8, lines#24,
-+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-+	bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
-+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-+	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, ed=\E[J,
-+	el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY,
-+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
-+	il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD,
-+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy,
-+	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU,
-+	kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_,
-+	knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM,
-+	rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
-+	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
-+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
-+	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, smcup=\E@0\E[?4s\E[?4h\E@1,
-+	smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys,
-+
-+xtermc|xterm terminal emulator (color),
-+	colors#8, ncv#7, pairs#64,
-+	op=\E[100m, 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,
-+	use=xtermm,
-+
-+# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
-+# Here's a termcap entry I've been using for xterm_color, which comes
-+# with BSD/OS 2.0, and the X11R6 contrib tape too I think.  Besides the
-+# color stuff, I also have a status line defined as the window manager
-+# 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,
-+	smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6,
- 
- # 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 +3925,32 @@
- 	ncv@,
- 	op=\E[m, use=xterm-r6, use=klone+color,
- 
-+# This entry describes an xterm with Sun-style function keys enabled
-+# via the X resource setting "xterm*sunFunctionKeys:true"
-+# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same.
-+# The <kf13>...<kf20> keys are L3-L10.  We don't set <kf16=\E[197z>
-+# because we want it to be seen as <kcpy>.
-+# The <kf31>...<kf45> keys are R1-R15.  We treat some of these in accordance
-+# with their Sun keyboard labels instead.
-+# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
-+xterm-sun|xterm with sunFunctionKeys true,
-+	kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB,
-+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z,
-+	kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z,
-+	kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z,
-+	kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z,
-+	kf20=\E[201z, kf3=\E[226z, kf31=\E[208z, kf32=\E[209z,
-+	kf33=\E[210z, kf34=\E[211z, kf35=\E[212z, kf36=\E[213z,
-+	kf38=\E[215z, kf4=\E[227z, kf40=\E[217z, kf42=\E[219z,
-+	kf44=\E[221z, kf45=\E[222z, kf46=\E[234z, kf47=\E[235z,
-+	kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z,
-+	kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z,
-+	kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z,
-+	use=xterm-basic,
-+xterms-sun|small (80x24) xterm with sunFunctionKeys true,
-+	cols#80, lines#24, use=xterm-sun,
-+
-+#### GNOME (VTE)
- # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
- gnome-rh62|Gnome terminal,
- 	bce,
-@@ -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,
- 
-+#### Other GNOME
- # Multi-Gnome-Terminal 1.6.2
- #
- # This does not use VTE, and does have different behavior (compare xfce and
-@@ -3874,6 +4097,7 @@
- mgt|Multi GNOME Terminal,
- 	indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333,
- 
-+#### KDE
- # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
- # or not is debatable).
- kvt|KDE terminal,
-@@ -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,
- 
-+#### MLTERM
- # This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD
- #
- # It is nominally a vt102 emulator, with features borrowed from rxvt and
-@@ -4037,6 +4261,7 @@
- mlterm-256color|mlterm 3.0 with xterm 256-colors,
- 	use=xterm+256color, use=rxvt,
- 
-+#### RXVT
- # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
- # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
- # Notes:
-@@ -4208,6 +4433,7 @@
- rxvt-16color|xterm with 16 colors like aixterm,
- 	ncv#32, use=ibm+16color, use=rxvt,
- 
-+#### MRXVT
- # mrxvt 0.5.4
- #
- # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
-@@ -4225,6 +4451,7 @@
- mrxvt-256color|multitabbed rxvt with 256 colors,
- 	use=xterm+256color, use=mrxvt,
- 
-+#### ETERM
- # From: Michael Jennings <mej@valinux.com>
- #
- # Eterm 0.9.3
-@@ -4270,11 +4497,13 @@
- Eterm-88color|Eterm with 88 colors,
- 	use=xterm+88color, use=Eterm,
- 
-+#### ATERM
- # Based on rxvt 2.4.8, it has a few differences in key bindings
- aterm|AfterStep terminal,
- 	XT,
- 	kbs=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=rxvt,
- 
-+#### XITERM
- # xiterm  0.5-5.2
- # This is not based on xterm's source...
- # vttest shows several problems with keyboard, cursor-movements.
-@@ -4283,48 +4512,8 @@
- 	km@,
- 	kbs=\177, kdch1=\E[3~, use=klone+color, use=xterm-r6,
- 
--# These (xtermc and xtermm) are distributed with Solaris.  They refer to a
--# variant of xterm which is apparently no longer supported, but are interesting
--# because they illustrate SVr4 curses mouse controls - T.Dickey
--xtermm|xterm terminal emulator (monocrome),
--	OTbs, am, km, mir, msgr, xenl,
--	btns#3, cols#80, it#8, lines#24,
--	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
--	bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
--	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
--	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, ed=\E[J,
--	el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY,
--	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
--	il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD,
--	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy,
--	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU,
--	kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_,
--	knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM,
--	rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
--	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
--	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
--	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, smcup=\E@0\E[?4s\E[?4h\E@1,
--	smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys,
--
--xtermc|xterm terminal emulator (color),
--	colors#8, ncv#7, pairs#64,
--	op=\E[100m, 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,
--	use=xtermm,
--
--# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
--# Here's a termcap entry I've been using for xterm_color, which comes
--# with BSD/OS 2.0, and the X11R6 contrib tape too I think.  Besides the
--# color stuff, I also have a status line defined as the window manager
--# title bar. [I have translated it to terminfo -- ESR]
--xterm-pcolor|xterm with color used for highlights and status line,
--	bold=\E[1m\E[43m, rev=\E[7m\E[34m, smso=\E[7m\E[31m,
--	smul=\E[4m\E[42m, use=xterm+sl, use=xterm-r6,
- 
-+#### HPTERM
- # HP ships this (HPUX 9 and 10), except for the pb#9600 which was merged in
- # from BSD termcap.  (hpterm:  added empty <acsc>, we have no idea what ACS
- # chars look like --esr)
-@@ -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,
- 
--# This entry describes an xterm with Sun-style function keys enabled
--# via the X resource setting "xterm*sunFunctionKeys:true"
--# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same.
--# The <kf13>...<kf20> keys are L3-L10.  We don't set <kf16=\E[197z>
--# because we want it to be seen as <kcpy>.
--# The <kf31>...<kf45> keys are R1-R15.  We treat some of these in accordance
--# with their Sun keyboard labels instead.
--# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
--xterm-sun|xterm with sunFunctionKeys true,
--	kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB,
--	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z,
--	kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z,
--	kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z,
--	kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z,
--	kf20=\E[201z, kf3=\E[226z, kf31=\E[208z, kf32=\E[209z,
--	kf33=\E[210z, kf34=\E[211z, kf35=\E[212z, kf36=\E[213z,
--	kf38=\E[215z, kf4=\E[227z, kf40=\E[217z, kf42=\E[219z,
--	kf44=\E[221z, kf45=\E[222z, kf46=\E[234z, kf47=\E[235z,
--	kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z,
--	kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z,
--	kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z,
--	use=xterm-basic,
--xterms-sun|small (80x24) xterm with sunFunctionKeys true,
--	cols#80, lines#24, use=xterm-sun,
--
-+#### EMU
- # This is for the extensible terminal emulator on the X11R6 contrib tape.
- # It corresponds to emu's internal emulation:
- #	emu -term emu
-@@ -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=,
- 	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
-+
-+#### MVTERM
- # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI,
- # print interface, ANSI X3.64 colour escape sequences, etc.  Newsgroup postings
- # indicate that it emulates more than one terminal, but incompletely.
-@@ -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,
- 
--### MTERM
-+#### MTERM
- #
- # This application is available by email from <mouse@Rodents.Montreal.QC.CA>.
- #
-@@ -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,
- 
-+#### SIMPLETERM
-+# st.suckless.org
-+# st-0.1.1
-+#
-+# Note:  the original terminfo description uses leading blank to persuade
-+# ncurses to use "st" as its name.  Proper fix for that is to use "st" as an
-+# alias.
-+#
-+# Reading the code shows it should work for aixterm 16-colors
-+# - added st-16color
-+#
-+# Using tack:
-+# - set eo (erase-overstrike)
-+# - set xenl
-+# - tbc doesn't work
-+# - hts works
-+# - cbt doesn't work
-+# - shifted cursor-keys send sequences like rxvt
-+# - sgr referred to unimplemented "invis" mode.
-+# Fixes: add eo and xenl per tack, remove nonworking cbt, hts and tbc, invis
-+simpleterm|st| simpleterm,
-+	am, eo, mir, msgr, ul, xenl,
-+	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
-+	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-+	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
-+	cnorm=\E[?12l\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr,
-+	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, 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,
-+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
-+	sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
-+st-16color|simpleterm with 16-colors,
-+	use=ibm+16color, use=simpleterm,
-+# 256 colors "works", but when running xterm's test-scripts, some garbage is
-+# shown in the titlebar.
-+st-256color|simpleterm with 256 colors,
-+	ccc@,
-+	initc@, use=xterm+256color, use=simpleterm,
-+
-+### TERMINATOR
-+# http://software.jessies.org/terminator/
-+# Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit
-+# Debian/current -TD (2011/8/20)
-+#
-+# There are some packaging problems:
-+# a) using Java, the program starts off using 50Mb, and climbs from there,
-+#    up to 114Mb after testing (no scrollback).
-+# b) it insists on reinstalling its terminal description in $HOME/.terminfo
-+#    (two copies, just in case the host happens to be Mac OS X).
-+#    I deleted this after testing with tack.
-+#
-+# Issues/features found with tack:
-+# a) tbc does not work (implying that hts also is broken).
-+#    Comparing with the tabs utility shows a problem with the last tabstop on
-+#    a line.
-+# b) has xterm-style shifted function-key strings
-+#    meta also is used, but control is ignored.
-+# c) has xterm-style modifiers for cursor keys (shift, control, shift+control, meta)
-+# d) some combinations of shift/control send xterm-style sequences for
-+#    insert/delete/home/end.
-+# e) numeric keypad sends only numbers (compare with vttest).
-+# f) meta mode (km) is not implemented.
-+#
-+# Issues found with ncurses test-program:
-+# a) bce is inconsistently implemented
-+# b) widths of Unicode values above 256 do not always agree with wcwidth.
-+#
-+# Checked with vttest, found low degree of compatibility there.
-+#
-+# Checked with xterm's scripts, found that the 256-color palette is fixed.
-+#
-+# Fixes:
-+# a) add sgr string
-+# b) corrected sgr0 to reset alternate character set
-+# c) modified smacs/rmacs to use SCS rather than SI/SO
-+# d) removed bce
-+# e) removed km
-+terminator|Terminator no line wrap,
-+	eo, mir, msgr, xenl, xon,
-+	colors#256, cols#80, it#8, lines#24, lm#0, pairs#32767,
-+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-+	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]2;\007, ed=\E[J, el=\E[K,
-+	el1=\E[1K, enacs=\E(B\E)0, flash=^G, fsl=^G, home=\E[H,
-+	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
-+	ind=^J, is1=\E[?47l\E=\E[?1l,
-+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
-+	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~, kf13=\E[25~, kf14=\E[26~,
-+	kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-+	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
-+	rmcup=\E[?47l\E8, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
-+	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
-+	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
-+	s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm,
-+	setaf=\E[38;5;%p1%dm,
-+	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%;m%?%p9%t\E(0%e\E(B%;,
-+	sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h,
-+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1,
-+	vpa=\E[%i%p1%dd,
-+
- ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
- #
- 
-@@ -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,
- 	kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z,
--	knp=\E[222z, kopt=\E[194z, kpp=\E[216z, kres=\E[193z,
--	kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@, rs2=\E[s,
--	sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, smso=\E[7m,
--	u8=\E[1t, u9=\E[11t,
-+	kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z,
-+	kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@,
-+	rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-+	smso=\E[7m, u8=\E[1t, u9=\E[11t,
- # On some versions of CGSIX framebuffer firmware (SparcStation 5), <il1>/<il>
- # flake out on the last line.  Unfortunately, without them the terminal has no
- # way to scroll.
-@@ -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,
- 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
--	cuu=\E[%p1%dA, home=\E[H, op=\E[0m, setab=\E[4%p1%dm,
--	setaf=\E[3%p1%dm,
-+	cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s,
-+	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=\E[0%?%p1;1%;%?%p3%;7%;m, sgr0=\E[m, smso=\E[1m,
- 	use=sun,
- 
- #### Iris consoles
-@@ -5405,7 +5694,7 @@
- #### Non-Unix Consoles
- #
- 
--### EMX termcap.dat compatibility modes
-+#### EMX termcap.dat compatibility modes
- #
- # 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 +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,
- 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
--	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-+	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
- 	sgr0=\E[0;10m, smacs=\E[11m, smcup=\E7\E[?47h,
- 	smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];,
- 	vpa=\E[%i%p1%dd, use=vt102+enq,
-@@ -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,
- 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
--	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
-+	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
- 	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
- 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
- 
-@@ -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,
- 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED$<5/>,
--	rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/lib/tabset/vt100,
-+	rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
- 	ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
- 	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 +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:\
- #	:HL=^AP\r:SP=\E[i:\
--#	:IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\
-+#	:IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:
- altos3|altos5|alt3|alt5|altos-3|altos-5|altos III or V,
- 	blink=\E[5p, ri=\EM, sgr0=\E[p, use=altos2,
- altos4|alt4|altos-4|altos IV,
-@@ -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,
- 	rs3=\E[=19h\E.3\E9\E0O\0\0\0\0\0\E0o\0\0\0\0\0\E0J\177\0\0\0\0,
--	sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p9%t\E$%e\E%%%;,
--	sgr0=\EG0, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
-+	sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p8%t\E&%;%?%p9%t\E$%e\E%%%;,
-+	sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
- 	smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O,
- 	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0,
- 
-@@ -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,
- 	sc=\E7,
--	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-+	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
- 	tsl=\E7\E[25;%p1%{1}%+%dH,
- 
-@@ -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,
- 	rmkx=\E[19;0j\E[21;1j\212, rmln=\E|,
--	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-+	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
- 	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 +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|,
- 	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7,
--	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-+	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
- 	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 +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,
- 	rs2=\Ec\E[?3l, sc=\E7,
--	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-+	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
- 	sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h,
- 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
- 	tsl=\E7\E[25;%i%p1%dx,
-@@ -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,
- 	rmul=\E[m, rs2=\Ec, sc=\E7,
--	sgr=\E[0%?%p2%t;4%;%?%p1%p3%|%p4%|%p5%|%t;7%;m,
-+	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7%;m,
- 	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
- att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
- 	lines#24, use=att630,
-@@ -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\\,
- 	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
--	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
-+	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
- 	sgr0=\E[m,
- 	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 +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,
- 	rs1=\E[H\E[7m\E[J$<156>,
--	sgr=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
-+	sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p2%|%p3%!%t7;%;%?%p7%t8;%;m\016,
- 	sgr0=\E[7m\016, smso=\E[m, smul=\E[4;7m,
- # Ambassador with the DEC option, for partial vt100 compatibility.
- aaa+dec|ann arbor ambassador in dec vt100 mode,
- 	acsc=aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}},
- 	csr=\E[%i%p1%d;%p2%dr, enacs=\E(0, rmacs=^N,
--	sgr=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;,
-+	sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p3%|%!%t7;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;,
- 	smacs=^O,
- aaa-18|ann arbor ambassador/18 lines,
- 	lines#18,
-@@ -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,
- 	rs1=\E[H\E[7m\E[J,
--	sgr=\E[%?%p1%!%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
-+	sgr=\E[%?%p6%t1;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p1%!%t7;%;%?%p7%t8;%;m,
- 	sgr0=\E[7m, smso=\E[m, smul=\E[4;7m,
- 
- #### Applied Digital Data Systems (adds)
-@@ -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!{,
- 	sc=\E7,
--	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
--	sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r,
--	smir=\E[4h, smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m,
--	tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
-+	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e\016%;$<1>,
-+	sgr0=\E[m\016$<1>, smacs=\017$<1>,
-+	smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h,
-+	smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-+	vpa=\E[%p1%{1}%+%dd,
- avt-rv-ns|concept avt in reverse video mode/no status line,
- 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
- 	use=avt-ns,
-@@ -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
- # grounds that there is no matching ":ml:"
--# fixed garbled ":k9=\E[00\:z:" capability -- esr)
- dg460-ansi|Data General Dasher 460 in ANSI-mode,
- 	OTbs, am, msgr, ul,
- 	cols#80, it#8, lines#24,
-@@ -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,
- 	kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z,
--	kf8=\E[009z, kf9=\E[010z, khome=\E[H, lf0=f1, lf1=f2, lf2=f3,
--	lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, rev=\E[7m,
--	ri=\E[T, rmso=\E[m, rmul=\E[05, sgr0=\E[m, smso=\E[7m,
--	smul=\E[4m,
-+	kf8=\E[009z, kf9=\E[00\:z, khome=\E[H, lf0=f1, lf1=f2,
-+	lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
-+	mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05,
-+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m,
-+	sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u6=\E[%d;%dR,
-+	u7=\E[6n, u8=\E[5n, u9=\E[0n,
- # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
- # Data General 605x
- # Ought to work for a Model 6242, Type D210 as well as a 605x.
-@@ -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,
- 
--####  Beehive Medical Electronics
-+#### Beehive Medical Electronics
- #
- # Steve Seymour <srseymour@mindspring.com> writes (Wed, 03 Feb 1999):
- # Regarding your question though; Beehive terminals weren't made by Harris.
-@@ -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,
- 	rmul=\E[%gh%{8}%^%Ph%gh%dZZ, rs2=\Eo1,
--	sgr=\E[%{0}%?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;ZZ,
-+	sgr=\E[%'0'%?%p1%t%'8'%|%;%?%p2%t%'8'%|%;%?%p3%t%'4'%|%;%?%p4%t%'2'%|%;%?%p7%t%'1'%|%;%cZZ,
- 	sgr0=\E[0ZZ, smir=\Eq, smso=\E[8ZZ, smul=\E[8ZZ, tbc=\E3,
- icl6404-w|kds7372-w|ICL 6404 aka Kokusai Display Systems 7372 132 cols,
- 	rs2=\Eo1, use=icl6404,
-@@ -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,
--	sgr=\E[%{0}%?%p1%p3%|%t%{7}%+%;%?%p2%t%{2}%+%;%?%p4%t%{5}%+%;%?%p6%t%{1}%+%;m%?%p8%t\E[%{32}%+%d%%{%;%?%p9%t\016%e\017%;,
-+	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?%p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
- 	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,
-+	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>,
- 	sc=\E7,
--	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>,
-+	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%;$<20>,
- 	sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h,
- 	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 +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>,
- 	sc=\E7,
--	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>,
-+	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%;$<20>,
- 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
- 	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 +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>,
- 	sc=\E7,
--	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>,
-+	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%;$<20>,
- 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
- 	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>,
-@@ -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
- minix|minix console (v3),
-+	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
-+	kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
-+	kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~,
-+	kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~,
-+	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~,
-+	kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~,
-+	kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~,
-+	kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~,
-+	kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~,
-+	kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~,
-+	kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~,
-+	kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~,
-+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
-+	use=minix-3.0,
-+
-+minix-3.0|minix console (v3.0),
- 	use=ecma+color, use=minix-1.7,
- 
- # See
-@@ -17792,7 +18141,7 @@
- 	am, use=minix-old,
- 
- pc-minix|minix console on an Intel box,
--	use=klone+acs, use=minix,
-+	use=klone+acs, use=minix-3.0,
- 
- # 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
-@@ -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
- #
- # The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94.
--# Releases 9 and up are maintained by Eric S. Raymond as part of the ncurses
--# project.
-+# Releases 9 and 10 (up until the release of ncurses 4.2 in 1998) were
-+# maintained by Eric S. Raymond as part of the ncurses project.
- #
- # 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 +21563,7 @@
- #	* Replaced HP entries up to hpsub with purpose-built ones.
- #	* Blank rmir/smir/rmdc/smdc capabilities removed.
- #	* Small fixes merged in from SCO entries for lpr, fos, tvi910+, tvi924.
--# 9.4.8 (Fri Apr  7 09:36:34 EDT 199):
-+# 9.4.8 (Fri Apr  7 09:36:34 EDT 1995):
- #	* Replaced the Ann Arbor entries with SCO's, the init strings are
- #	  more efficient (but the entries otherwise identical).
- #	* Added dg211 from Shuford archive.
-@@ -22224,7 +22672,7 @@
- #	* add screen.rxvt -TD
- #
- # 2008-04-28
--#	* add screen+fkeys (prompted by Debian # 478094) -TD
-+#	* add screen+fkeys (prompted by Debian #478094) -TD
- #
- # 2008-06-28
- #	* add screen.mlterm -TD
-@@ -22354,6 +22802,139 @@
- #	* add xterm-utf8 as a demo of the U8 feature -TD
- #
- # 2011-02-20
--#	* add cons25-debian entry (Brian M Carlson, Debina #607662).
-+#	* add cons25-debian entry (Brian M Carlson, Debian #607662).
-+#
-+# 2011-06-11
-+#	* update minix entry to minix 3.2 (Thomas Cort).
-+#
-+# 2011-07-09
-+#	* fix inconsistent tabset path in pcmw (Todd C. Miller).
-+#	* remove a backslash which continued comment, obscuring altos3
-+#	  definition with OpenBSD toolset (Nicholas Marriott).
-+#
-+# 2011-07-16
-+#	* add/use xterm+tmux chunk from xterm #271 -TD
-+#	* resync xterm-new entry from xterm #271 -TD
-+#	* add E3 extended capability to linux-basic (Miroslav Lichvar)
-+#	* add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD
-+#	* add SI/SO change to linux2.6 entry (Debian #515609) -TD
-+#
-+# 2011-07-21
-+#	* add kich1 to sun (Yuri Pankov)
-+#	* use bold rather than reverse for smso in sun-color (Yuri Pankov).
-+#
-+# 2011-08-06
-+#	* corrected k9 in dg460-ansi, add other features based on manuals -TD
-+#
-+# 2011-08-20
-+#	* minor cleanup of X-terminal emulator section -TD
-+#	* add terminator entry -TD
-+#	* add simpleterm entry -TD
-+#
-+# 2011-09-10
-+#	* add xterm+kbs fragment from xterm #272 -TD
-+#
-+# 2011-11-12
-+#	* add pccon entries for OpenBSD console (Alexei Malinin)
-+#
-+# 2011-12-17
-+#	* corrected old changelog comments -TD
-+#
-+# 2011-11-24
-+#	* add putty-sco -TD
-+#
-+# 2012-01-28
-+#	* add mach-gnu (Samuel Thibault)
-+#	* add mach-gnu-color, tweaks to mach-gnu -TD
-+#	* make sgr for sun-color agree with smso -TD
-+#	* make sgr for prism9 agree with other caps -TD
-+#	* make sgr for icl6404 agree with other caps -TD
-+#	* make sgr for ofcons agree with other caps -TD
-+#	* make sgr for att5410v1, att4415, att620 agree with other caps -TD
-+#	* make sgr for aaa-unk, aaa-rv agree with other caps -TD
-+#	* make sgr for avt-ns agree with other caps -TD
-+#
-+# 2012-02-11
-+#	* make sgr for xterm-pcolor agree with other caps -TD
-+#	* make sgr for att5425 agree with other caps -TD
-+#	* make sgr for att630 agree with other caps -TD
-+#	* make sgr for linux entries agree with other caps -TD
-+#	* make sgr for tvi9065 agree with other caps -TD
-+#	* make sgr for ncr260vt200an agree with other caps -TD
-+#	* make sgr for ncr160vt100pp agree with other caps -TD
-+#	* make sgr for ncr260vt300an agree with other caps -TD
-+#	* 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-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.88 2012/02/25 20:22:09 tom Exp $
- ##############################################################################
--# 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 "Software"), #
-@@ -38,6 +38,7 @@
- #	prefix		  (e.g., "lib", for Unix-style libraries)
- #	suffix		  (e.g., "_g.a", for debug libraries)
- #	subset		  ("none", "base", "base+ext_funcs" or "termlib", etc.)
-+#	driver		  ("yes" or "no", depends on --enable-term-driver)
- #	ShlibVer	  ("rel", "abi" or "auto", to augment DoLinks variable)
- #	ShlibVerInfix ("yes" or "no", determines location of version #)
- #	SymLink		  ("ln -s", etc)
-@@ -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
- 		printf "\t\t%s \\\n", directory
-+		if (subset == "ticlib" && driver == "yes" ) {
-+			base = name;
-+			sub(/^tic/, "ncurses", base); # workaround for "w"
-+			printf "\t\t%s/%s \\\n", directory, end_name_of(base);
-+		}
- 		if (subset ~ /^base/ || subset == "ticlib" ) {
- 			save_suffix = suffix
- 			sub(/^[^.]\./,".",suffix)
-@@ -242,6 +252,7 @@
- 					printf "#  prefix:        %s\n", prefix 
- 					printf "#  suffix:        %s\n", suffix 
- 					printf "#  subset:        %s\n", subset 
-+					printf "#  driver:        %s\n", driver 
- 					printf "#  ShlibVer:      %s\n", ShlibVer 
- 					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;
- 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
- 				if ( is_ticlib() ) {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
-+					which_list = "TICS_LIST";
- 				} else if ( is_termlib() ) {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
-+					which_list = "TINFO_LIST";
- 				} else {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
-+					which_list = "SHLIB_LIST";
- 				}
-+				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", compile, lib_name, OBJS, libtool_version, which_list
- 				print  ""
- 				print  "install \\"
- 				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-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.133 2012/08/11 21:31:56 tom Exp $
- ##############################################################################
--# 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 "Software"), #
-@@ -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@
- 
-+RPATH_LIST	= @RPATH_LIST@
- MK_SHARED_LIB	= @MK_SHARED_LIB@
- 
- 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-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 @@
- #
- # MKlib_gen.sh -- generate sources from curses.h macro definitions
- #
--# ($Id: MKlib_gen.sh,v 1.43 2011/01/22 19:47:29 tom Exp $)
-+# ($Id: MKlib_gen.sh,v 1.46 2011/06/04 19:14:08 tom Exp $)
- #
- ##############################################################################
- # Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
-@@ -410,10 +410,45 @@
- 		print "#undef vwprintw"
- 		}
- /^DECLARATIONS/	{start = 1; next;}
--		{if (start) print \$0;}
-+		{
-+		if (start) {
-+			if ( "$USE" == "generated" ) {
-+				print \$0;
-+			} else if ( \$0 ~ /^[{}]?\$/ ) {
-+				print \$0;
-+			} else if ( \$0 ~ /;/ ) {
-+				print \$0;
-+			} else {
-+				calls[start] = \$0;
-+				print \$0;
-+				start++;
-+			}
-+		}
-+		}
- END		{
- 		if ( "$USE" != "generated" ) {
--			print "int main(void) { return 0; }"
-+			print "int main(void)"
-+			print "{"
-+			for (n = 1; n < start; ++n) {
-+				value = calls[n];
-+				if ( value !~ /P_POUNDC/ ) {
-+					gsub(/[[:blank:]]+/," ",value);
-+					sub(/^[[:alnum:]_]+ /,"",value);
-+					sub(/^\* /,"",value);
-+					gsub(/[[:alnum:]_]+ \* /,"",value);
-+					gsub(/ (const) /," ",value);
-+					gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
-+					gsub(/ void /,"",value);
-+					sub(/^/,"call_",value);
-+					gsub(/ (a[[:digit:]]|z) /, " 0 ", value);
-+					gsub(/ int[[:blank:]]*[(][^)]+[)][(][^)]+[)]/, "0", value);
-+					printf "\t%s;\n", value;
-+				} else {
-+					print value;
-+				}
-+			}
-+			print "	return 0;"
-+			print "}"
- 		}
- 		}
- EOF1
-@@ -422,6 +457,8 @@
- #include <ncurses_cfg.h>
- #undef NCURSES_NOMACROS
- #include <curses.h>
-+#include <term.h>
-+#include <unctrl.h>
- 
- 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1999-2006,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2009,2011 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>
- 
--MODULE_ID("$Id: keybound.c,v 1.10 2009/10/24 22:15:47 tom Exp $")
-+MODULE_ID("$Id: keybound.c,v 1.11 2011/10/22 16:47:05 tom Exp $")
- 
- /*
-  * Returns the count'th string definition which is associated with the
-@@ -46,7 +46,10 @@
- 
-     T((T_CALLED("keybound(%p, %d,%d)"), (void *) SP_PARM, code, count));
-     if (SP_PARM != 0 && code >= 0) {
--	result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0);
-+	result = _nc_expand_try(SP_PARM->_keytry,
-+				(unsigned) code,
-+				&count,
-+				(size_t) 0);
-     }
-     returnPtr(result);
- }
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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>
- 
--MODULE_ID("$Id: keyok.c,v 1.10 2009/10/24 22:15:47 tom Exp $")
-+MODULE_ID("$Id: keyok.c,v 1.12 2011/10/22 17:03:22 tom Exp $")
- 
- /*
-  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
-@@ -50,37 +50,41 @@
- {
-     int code = ERR;
- 
--    T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag));
-+    if (HasTerminal(SP_PARM)) {
-+	T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag));
- #ifdef USE_TERM_DRIVER
--    code = CallDriver_2(sp, kyOk, c, flag);
-+	code = CallDriver_2(sp, kyOk, c, flag);
- #else
--    T((T_CALLED("keyok(%d,%d)"), c, flag));
--    if (c >= 0) {
--	int count = 0;
--	char *s;
--	unsigned ch = (unsigned) c;
--
--	if (flag) {
--	    while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0
--		   && _nc_remove_key(&(SP_PARM->_key_ok), ch)) {
--		code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
--		free(s);
--		count = 0;
--		if (code != OK)
--		    break;
--	    }
--	} else {
--	    while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0
--		   && _nc_remove_key(&(SP_PARM->_keytry), ch)) {
--		code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
--		free(s);
--		count = 0;
--		if (code != OK)
--		    break;
-+	T((T_CALLED("keyok(%d,%d)"), c, flag));
-+	if (c >= 0) {
-+	    int count = 0;
-+	    char *s;
-+	    unsigned ch = (unsigned) c;
-+
-+	    if (flag) {
-+		while ((s = _nc_expand_try(SP_PARM->_key_ok,
-+					   ch, &count, (size_t) 0)) != 0
-+		       && _nc_remove_key(&(SP_PARM->_key_ok), ch)) {
-+		    code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
-+		    free(s);
-+		    count = 0;
-+		    if (code != OK)
-+			break;
-+		}
-+	    } else {
-+		while ((s = _nc_expand_try(SP_PARM->_keytry,
-+					   ch, &count, (size_t) 0)) != 0
-+		       && _nc_remove_key(&(SP_PARM->_keytry), ch)) {
-+		    code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
-+		    free(s);
-+		    count = 0;
-+		    if (code != OK)
-+			break;
-+		}
- 	    }
- 	}
--    }
- #endif
-+    }
-     returnCode(code);
- }
- 
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_addch.c,v 1.124 2010/04/24 22:41:05 tom Exp $")
-+MODULE_ID("$Id: lib_addch.c,v 1.125 2011/10/22 16:51:31 tom Exp $")
- 
- static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
- 
-@@ -209,7 +209,8 @@
-     buffer[WINDOW_EXT(win, addch_used)] = '\0';
-     if ((len = (int) mbrtowc(&result,
- 			     buffer,
--			     WINDOW_EXT(win, addch_used), &state)) > 0) {
-+			     (size_t) WINDOW_EXT(win, addch_used),
-+			     &state)) > 0) {
- 	attr_t attrs = AttrOf(CHDEREF(ch));
- 	if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
- 	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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_addstr.c,v 1.51 2010/12/19 01:22:58 tom Exp $")
-+MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $")
- 
- NCURSES_EXPORT(int)
- waddnstr(WINDOW *win, const char *astr, int n)
-@@ -119,8 +119,10 @@
- _nc_wchstrlen(const cchar_t *s)
- {
-     int result = 0;
--    while (CharOf(s[result]) != L'\0') {
--	result++;
-+    if (s != 0) {
-+	while (CharOf(s[result]) != L'\0') {
-+	    result++;
-+	}
-     }
-     return result;
- }
-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-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 @@
- 
- #include <curses.priv.h>
- 
--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.45 2012/03/10 21:20:18 tom Exp $")
- 
- /*
-  * Set the window's background information.
-@@ -118,16 +118,16 @@
- {
-     int code = ERR;
-     int x, y;
--    NCURSES_CH_T new_bkgd = CHDEREF(ch);
- 
-     T((T_CALLED("wbkgd(%p,%s)"), (void *) win, _tracech_t(ch)));
- 
-     if (win) {
-+	NCURSES_CH_T new_bkgd = CHDEREF(ch);
- 	NCURSES_CH_T old_bkgrnd;
- 	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-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-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            *
-@@ -45,7 +45,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--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.105 2012/06/09 20:34:11 tom Exp $")
- 
- #ifdef USE_TERM_DRIVER
- #define CanChange      InfoOf(SP_PARM).canchange
-@@ -331,6 +331,13 @@
- 				 default_bg(NCURSES_SP_ARG),
- 				 NCURSES_SP_NAME(_nc_outch));
- 	}
-+#if !NCURSES_EXT_COLORS
-+	/*
-+	 * Without ext-colors, we cannot represent more than 256 color pairs.
-+	 */
-+	if (maxpairs > 256)
-+	    maxpairs = 256;
-+#endif
- 
- 	if (maxpairs > 0 && maxcolors > 0) {
- 	    SP_PARM->_pair_limit = maxpairs;
-@@ -383,10 +390,10 @@
- 
- /* This function was originally written by Daniel Weaver <danw@znyx.com> */
- static void
--rgb2hls(short r, short g, short b, short *h, short *l, short *s)
-+rgb2hls(int r, int g, int b, short *h, short *l, short *s)
- /* convert RGB to HLS system */
- {
--    short min, max, t;
-+    int min, max, t;
- 
-     if ((min = g < r ? g : r) > b)
- 	min = b;
-@@ -416,7 +423,7 @@
-     else
- 	t = (short) (360 + ((r - g) * 60) / (max - min));
- 
--    *h = t % 360;
-+    *h = (short) (t % 360);
- }
- 
- /*
-@@ -439,7 +446,7 @@
- 
-     previous = SP_PARM->_color_pairs[pair];
- #if NCURSES_EXT_FUNCS
--    if (SP_PARM->_default_color) {
-+    if (SP_PARM->_default_color || SP_PARM->_assumed_color) {
- 	bool isDefault = FALSE;
- 	bool wasDefault = FALSE;
- 	int default_pairs = SP_PARM->_default_pairs;
-@@ -498,8 +505,9 @@
-     {
- 	if ((f < 0) || !OkColorHi(f)
- 	    || (b < 0) || !OkColorHi(b)
--	    || (pair < 1))
-+	    || (pair < 1)) {
- 	    returnCode(ERR);
-+	}
-     }
- 
-     /*
-@@ -628,8 +636,15 @@
- NCURSES_EXPORT(bool)
- NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL)
- {
-+    int result = FALSE;
-+
-     T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM));
--    returnCode((CanChange != 0) ? TRUE : FALSE);
-+
-+    if (HasTerminal(SP_PARM) && (CanChange != 0)) {
-+	result = TRUE;
-+    }
-+
-+    returnCode(result);
- }
- 
- #if NCURSES_SP_FUNCS
-@@ -643,20 +658,22 @@
- NCURSES_EXPORT(bool)
- NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
- {
--    int code;
-+    int code = FALSE;
- 
-     (void) SP_PARM;
-     T((T_CALLED("has_colors()")));
-+    if (HasTerminal(SP_PARM)) {
- #ifdef USE_TERM_DRIVER
--    code = HasColor;
-+	code = HasColor;
- #else
--    code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
--	     && (((set_foreground != NULL)
--		  && (set_background != NULL))
--		 || ((set_a_foreground != NULL)
--		     && (set_a_background != NULL))
--		 || set_color_pair)) ? TRUE : FALSE);
-+	code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
-+		 && (((set_foreground != NULL)
-+		      && (set_background != NULL))
-+		     || ((set_a_foreground != NULL)
-+			 && (set_a_background != NULL))
-+		     || set_color_pair)) ? TRUE : FALSE);
- #endif
-+    }
-     returnCode(code);
- }
- 
-@@ -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 @@
- 
- NCURSES_EXPORT(void)
- NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
--			       short old_pair,
--			       short pair,
--			       bool reverse,
-+			       int old_pair,
-+			       int pair,
-+			       int reverse,
- 			       NCURSES_SP_OUTC outc)
- {
- #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 @@
- 
- #if NCURSES_SP_FUNCS
- NCURSES_EXPORT(void)
--_nc_do_color(short old_pair, short pair, bool reverse, NCURSES_OUTC outc)
-+_nc_do_color(int old_pair, int pair, int reverse, NCURSES_OUTC outc)
- {
-     SetSafeOutcWrapper(outc);
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_dft_fgbg.c,v 1.25 2009/10/24 22:15:00 tom Exp $")
-+MODULE_ID("$Id: lib_dft_fgbg.c,v 1.26 2011/04/23 18:28:18 tom Exp $")
- 
- /*
-  * Modify the behavior of color-pair 0 so that the library doesn't assume that
-@@ -80,6 +80,7 @@
- 	SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK);
- 	if (SP_PARM->_color_pairs != 0) {
- 	    bool save = SP_PARM->_default_color;
-+	    SP_PARM->_assumed_color = TRUE;
- 	    SP_PARM->_default_color = TRUE;
- 	    init_pair(0, (short) fg, (short) bg);
- 	    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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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            *
-@@ -46,7 +46,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_flash.c,v 1.11 2009/10/24 22:02:14 tom Exp $")
-+MODULE_ID("$Id: lib_flash.c,v 1.12 2011/05/28 21:53:45 tom Exp $")
- 
- /*
-  *	flash()
-@@ -66,15 +66,17 @@
-     if (SP_PARM != 0)
- 	res = CallDriver_1(SP_PARM, doBeepOrFlash, FALSE);
- #else
--    /* FIXME: should make sure that we are not in altchar mode */
--    if (flash_screen) {
--	TPUTS_TRACE("flash_screen");
--	res = putp(flash_screen);
--	_nc_flush();
--    } else if (bell) {
--	TPUTS_TRACE("bell");
--	res = putp(bell);
--	_nc_flush();
-+    if (HasTerminal(SP_PARM)) {
-+	/* FIXME: should make sure that we are not in altchar mode */
-+	if (flash_screen) {
-+	    TPUTS_TRACE("flash_screen");
-+	    res = putp(flash_screen);
-+	    _nc_flush();
-+	} else if (bell) {
-+	    TPUTS_TRACE("bell");
-+	    res = putp(bell);
-+	    _nc_flush();
-+	}
-     }
- #endif
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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 @@
- extern int malloc_errfd;	/* FIXME */
- #endif
- 
--MODULE_ID("$Id: lib_freeall.c,v 1.59 2010/01/23 17:57:43 tom Exp $")
-+MODULE_ID("$Id: lib_freeall.c,v 1.60 2011/10/22 16:34:50 tom Exp $")
- 
- /*
-  * Free all ncurses data.  This is used for testing only (there's no practical
-@@ -100,7 +100,7 @@
- 
-     (void) _nc_printf_string(0, empty_va);
- #ifdef TRACE
--    (void) _nc_trace_buf(-1, 0);
-+    (void) _nc_trace_buf(-1, (size_t) 0);
- #endif
- #if USE_WIDEC_SUPPORT
-     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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -42,7 +42,7 @@
- 
- #include <curses.priv.h>
- 
--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.125 2012/08/04 17:11:37 tom Exp $")
- 
- #include <fifo_defs.h>
- 
-@@ -133,7 +133,7 @@
-     int rc;
- 
- #ifdef USE_TERM_DRIVER
--    rc = TCBOf(sp)->drv->testmouse(TCBOf(sp), delay);
-+    rc = TCBOf(sp)->drv->testmouse(TCBOf(sp), delay EVENTLIST_2nd(evl));
- #else
- #if USE_SYSMOUSE
-     if ((sp->_mouse_type == M_SYSMOUSE)
-@@ -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
- #endif
-+#if USE_KLIBC_KBD
-+    if (isatty(sp->_ifd) && sp->_cbreak) {
-+	ch = _read_kbd(0, 1, !sp->_raw);
-+	n = (ch == -1) ? -1 : 1;
-+	sp->_extended_key = (ch == 0);
-+    } else
-+#endif
-     {				/* Can block... */
- #ifdef USE_TERM_DRIVER
- 	int buf;
-@@ -270,7 +278,7 @@
- #  endif
- 	    _nc_globals.read_thread = pthread_self();
- # endif
--	n = (int) read(sp->_ifd, &c2, 1);
-+	n = (int) read(sp->_ifd, &c2, (size_t) 1);
- #if USE_PTHREADS_EINTR
- 	_nc_globals.read_thread = 0;
- #endif
-@@ -569,7 +577,7 @@
-      *
-      * If carriage return is defined as a function key in the
-      * terminfo, e.g., kent, then Solaris may return either ^J (or ^M
--     * if nonl() is set) or KEY_ENTER depending on the echo() mode. 
-+     * if nonl() is set) or KEY_ENTER depending on the echo() mode.
-      * We echo before translating carriage return based on nonl(),
-      * 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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,14 +40,14 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_getstr.c,v 1.29 2009/10/24 21:59:02 tom Exp $")
-+MODULE_ID("$Id: lib_getstr.c,v 1.30 2011/10/22 16:31:35 tom Exp $")
- 
- /*
-  * This wipes out the last character, no matter whether it was a tab, control
-  * or other character, and handles reverse wraparound.
-  */
- static char *
--WipeOut(WINDOW *win, int y, int x, char *first, char *last, bool echoed)
-+WipeOut(WINDOW *win, int y, int x, char *first, char *last, int echoed)
- {
-     if (last > first) {
- 	*--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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_instr.c,v 1.17 2009/10/24 22:55:45 tom Exp $")
-+MODULE_ID("$Id: lib_instr.c,v 1.18 2011/10/22 16:31:35 tom Exp $")
- 
- NCURSES_EXPORT(int)
- winnstr(WINDOW *win, char *str, int n)
-@@ -78,7 +78,7 @@
- 		    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
- 
- 			init_mb(state);
--			n3 = wcstombs(0, wch, 0);
-+			n3 = wcstombs(0, wch, (size_t) 0);
- 			if (!isEILSEQ(n3) && (n3 != 0)) {
- 			    if (((int) n3 + i) > n) {
- 				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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -84,7 +84,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--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.139 2012/07/21 23:30:50 tom Exp $")
- 
- #include <tic.h>
- 
-@@ -120,6 +120,17 @@
- #endif
- #endif				/* use_SYSMOUSE */
- 
-+#if USE_KLIBC_MOUSE
-+#include <sys/socket.h>
-+#define pipe(handles) socketpair(AF_LOCAL, SOCK_STREAM, 0, handles)
-+#define DosWrite(hfile, pbuffer, cbwrite, pcbactual) \
-+		write(hfile, pbuffer, cbwrite)
-+#define DosExit(action, result )	/* do nothing */
-+#define DosCreateThread(ptid, pfn, param, flag, cbStack) \
-+		(*(ptid) = _beginthread(pfn, NULL, cbStack, \
-+					(void *)param), (*(ptid) == -1))
-+#endif
-+
- #define MY_TRACE TRACE_ICALLS|TRACE_IEVENT
- 
- #define	MASK_RELEASE(x)		(mmask_t) NCURSES_MOUSE_MASK(x, 001)
-@@ -148,6 +159,9 @@
- #define INVALID_EVENT	-1
- #define NORMAL_EVENT	0
- 
-+#define ValidEvent(ep) ((ep)->id != INVALID_EVENT)
-+#define Invalidate(ep) (ep)->id = INVALID_EVENT
-+
- #if USE_GPM_SUPPORT
- 
- #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 @@
- }
- 
- static void
-+#if USE_KLIBC_MOUSE
-+mouse_server(void *param)
-+#else
- mouse_server(unsigned long param)
-+#endif
- {
-     SCREEN *sp = (SCREEN *) param;
-     unsigned short fWait = MOU_WAIT;
-@@ -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);
- 	    for (i = 0; i < EV_MAX; i++)
--		sp->_mouse_events[i].id = INVALID_EVENT;
-+		Invalidate(sp->_mouse_events + i);
- 
- 	    initialize_mousetype(sp);
- 
-@@ -750,6 +779,7 @@
- 			eventp->bstate |= BUTTON3_RELEASED;
- 		    break;
- 		default:
-+		    eventp->bstate |= REPORT_MOUSE_POSITION;
- 		    break;
- 		}
- 
-@@ -830,7 +860,6 @@
- 
-     if (sp->_mouse_type == M_XTERM) {
- 	unsigned char kbuf[4];
--	mmask_t prev;
- 	size_t grabbed;
- 	int res;
- 
-@@ -896,35 +925,51 @@
- 
- 	/* processing code goes here */
- 	eventp->bstate = 0;
--	prev = PREV(eventp)->bstate;
- 
- #if USE_EMX_MOUSE
- #define PRESS_POSITION(n) \
--	eventp->bstate = MASK_PRESS(n); \
--	if (kbuf[0] & 0x40) \
--	    eventp->bstate = MASK_RELEASE(n)
-+	do { \
-+		eventp->bstate = MASK_PRESS(n); \
-+		sp->_mouse_bstate |= MASK_PRESS(n); \
-+		if (kbuf[0] & 0x40) { \
-+			eventp->bstate = MASK_RELEASE(n); \
-+			sp->_mouse_bstate &= ~MASK_PRESS(n); \
-+		} \
-+	} while (0)
- #else
- #define PRESS_POSITION(n) \
--	eventp->bstate = (mmask_t) (prev & MASK_PRESS(n) \
--				    ? REPORT_MOUSE_POSITION \
--				    : MASK_PRESS(n))
-+	do { \
-+		eventp->bstate = (mmask_t) (sp->_mouse_bstate & MASK_PRESS(n) \
-+					? REPORT_MOUSE_POSITION \
-+					: MASK_PRESS(n)); \
-+		sp->_mouse_bstate |= MASK_PRESS(n); \
-+	} while (0)
- #endif
- 
- 	switch (kbuf[0] & 0x3) {
- 	case 0x0:
--	    if (kbuf[0] & 64)
-+	    if ((kbuf[0] & 96) == 96) {
- 		eventp->bstate = MASK_PRESS(4);
--	    else
-+		/* Do not record in sp->_mouse_bstate; there will be no
-+		 * corresponding release event.
-+		 */
-+	    } else {
- 		PRESS_POSITION(1);
-+	    }
- 	    break;
- 
- 	case 0x1:
-+	    if ((kbuf[0] & 96) == 96) {
- #if NCURSES_MOUSE_VERSION == 2
--	    if (kbuf[0] & 64)
- 		eventp->bstate = MASK_PRESS(5);
--	    else
-+		/* See comment above for button 4 */
-+#else
-+		/* Ignore this event as it is not a true press of the button */
-+		eventp->bstate = REPORT_MOUSE_POSITION;
- #endif
-+	    } else {
- 		PRESS_POSITION(2);
-+	    }
- 	    break;
- 
- 	case 0x2:
-@@ -939,12 +984,13 @@
- 	     * release, we can infer the button actually released by looking at
- 	     * the previous event.
- 	     */
--	    if (prev & (BUTTON_PRESSED | BUTTON_RELEASED)) {
-+	    if (sp->_mouse_bstate & BUTTON_PRESSED) {
- 		eventp->bstate = BUTTON_RELEASED;
- 		for (b = 1; b <= MAX_BUTTONS; ++b) {
--		    if (!(prev & MASK_PRESS(b)))
-+		    if (!(sp->_mouse_bstate & MASK_PRESS(b)))
- 			eventp->bstate &= ~MASK_RELEASE(b);
- 		}
-+		sp->_mouse_bstate = 0;
- 	    } else {
- 		/*
- 		 * XFree86 xterm will return a stream of release-events to
-@@ -985,7 +1031,7 @@
- }
- 
- static void
--mouse_activate(SCREEN *sp, bool on)
-+mouse_activate(SCREEN *sp, int on)
- {
-     if (!on && !sp->_mouse_initialized)
- 	return;
-@@ -994,7 +1040,7 @@
- 	return;
- 
-     if (on) {
--
-+	sp->_mouse_bstate = 0;
- 	switch (sp->_mouse_type) {
- 	case M_XTERM:
- #if NCURSES_EXT_FUNCS
-@@ -1074,10 +1120,13 @@
- /* parse a run of atomic mouse events into a gesture */
- {
-     MEVENT *eventp = sp->_mouse_eventp;
--    MEVENT *ep, *runp, *next, *prev = PREV(eventp);
-+    MEVENT *next, *ep;
-+    MEVENT *first_valid = NULL;
-+    MEVENT *first_invalid = NULL;
-     int n;
-     int b;
-     bool merge;
-+    bool endLoop;
- 
-     TR(MY_TRACE, ("_nc_mouse_parse(%d) called", runcount));
- 
-@@ -1094,7 +1143,8 @@
-      *
-      * It's possible that the run may not resolve to a single event (for
-      * example, if the user quadruple-clicks).  If so, leading events
--     * in the run are ignored.
-+     * in the run are ignored if user does not call getmouse in a loop (getting
-+     * them from newest to older).
-      *
-      * 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 +1152,110 @@
-      * button basis, as long as the device-dependent mouse code puts stuff
-      * on the queue in MEVENT format.
-      */
--    if (runcount == 1) {
--	TR(MY_TRACE,
--	   ("_nc_mouse_parse: returning simple mouse event %s at slot %ld",
--	    _nc_tracemouse(sp, prev),
--	    (long) IndexEV(sp, prev)));
--	return (prev->id >= NORMAL_EVENT)
--	    ? ((prev->bstate & sp->_mouse_mask) ? TRUE : FALSE)
--	    : FALSE;
--    }
- 
--    /* find the start of the run */
--    runp = eventp;
--    for (n = runcount; n > 0; n--) {
--	runp = PREV(runp);
-+    /*
-+     * Reset all events that were not set, in case the user sometimes calls
-+     * getmouse only once and other times until there are no more events in
-+     * queue.
-+     *
-+     * This also allows reaching the beginning of the run.
-+     */
-+    ep = eventp;
-+    for (n = runcount; n < EV_MAX; n++) {
-+	Invalidate(ep);
-+	ep = NEXT(ep);
-     }
- 
- #ifdef TRACE
-     if (USE_TRACEF(TRACE_IEVENT)) {
- 	_trace_slot(sp, "before mouse press/release merge:");
- 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		RunParams(sp, eventp, runp),
-+		RunParams(sp, eventp, ep),
- 		runcount);
- 	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-     /* first pass; merge press/release pairs */
--    do {
--	merge = FALSE;
--	for (ep = runp; (next = NEXT(ep)) != eventp; ep = next) {
-+    endLoop = FALSE;
-+    while (!endLoop) {
-+	next = NEXT(ep);
-+	if (next == eventp) {
-+	    /* Will end the loop, but compact before */
-+	    endLoop = TRUE;
-+	} else {
- 
- #define MASK_CHANGED(x) (!(ep->bstate & MASK_PRESS(x)) \
- 		      == !(next->bstate & MASK_RELEASE(x)))
- 
--	    if (ep->x == next->x && ep->y == next->y
-+	    if (ValidEvent(ep) && ValidEvent(next)
-+		&& ep->x == next->x && ep->y == next->y
- 		&& (ep->bstate & BUTTON_PRESSED)
--		&& MASK_CHANGED(1)
--		&& MASK_CHANGED(2)
--		&& MASK_CHANGED(3)
--		&& MASK_CHANGED(4)
--#if NCURSES_MOUSE_VERSION == 2
--		&& MASK_CHANGED(5)
--#endif
--		) {
-+		&& (!(next->bstate & BUTTON_PRESSED))) {
-+		bool changed = TRUE;
-+
- 		for (b = 1; b <= MAX_BUTTONS; ++b) {
--		    if ((sp->_mouse_mask & MASK_CLICK(b))
--			&& (ep->bstate & MASK_PRESS(b))) {
--			ep->bstate &= ~MASK_PRESS(b);
--			ep->bstate |= MASK_CLICK(b);
--			merge = TRUE;
-+		    if (!MASK_CHANGED(b)) {
-+			changed = FALSE;
-+			break;
-+		    }
-+		}
-+
-+		if (changed) {
-+		    merge = FALSE;
-+		    for (b = 1; b <= MAX_BUTTONS; ++b) {
-+			if ((sp->_mouse_mask & MASK_CLICK(b))
-+			    && (ep->bstate & MASK_PRESS(b))) {
-+			    next->bstate &= ~MASK_RELEASE(b);
-+			    next->bstate |= MASK_CLICK(b);
-+			    merge = TRUE;
-+			}
-+		    }
-+		    if (merge) {
-+			Invalidate(ep);
- 		    }
- 		}
--		if (merge)
--		    next->id = INVALID_EVENT;
- 	    }
- 	}
--    } while
--	(merge);
- 
-+	/* Compact valid events */
-+	if (!ValidEvent(ep)) {
-+	    if ((first_valid != NULL) && (first_invalid == NULL)) {
-+		first_invalid = ep;
-+	    }
-+	} else {
-+	    if (first_valid == NULL) {
-+		first_valid = ep;
-+	    } else if (first_invalid != NULL) {
-+		*first_invalid = *ep;
-+		Invalidate(ep);
-+		first_invalid = NEXT(first_invalid);
-+	    }
-+	}
-+
-+	ep = next;
-+    }
-+
-+    if (first_invalid != NULL) {
-+	eventp = first_invalid;
-+    }
- #ifdef TRACE
-     if (USE_TRACEF(TRACE_IEVENT)) {
- 	_trace_slot(sp, "before mouse click merge:");
--	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		RunParams(sp, eventp, runp),
--		runcount);
--	_nc_unlock_global(tracef);
-+	if (first_valid == NULL) {
-+	    _tracef("_nc_mouse_parse: no valid event");
-+	} else {
-+	    _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
-+		    RunParams(sp, eventp, first_valid),
-+		    runcount);
-+	    _nc_unlock_global(tracef);
-+	}
-     }
- #endif /* TRACE */
- 
-     /*
--     * Second pass; merge click runs.  At this point, click events are
--     * each followed by one invalid event. We merge click events
--     * forward in the queue.
-+     * Second pass; merge click runs.  We merge click events forward in the
-+     * queue.  For example, double click can be changed to triple click.
-      *
-      * 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 +1268,102 @@
-      * but the timer element would have to have sub-second resolution,
-      * which would get us into portability trouble.
-      */
--    do {
--	MEVENT *follower;
--
--	merge = FALSE;
--	for (ep = runp; (next = NEXT(ep)) != eventp; ep = next)
--	    if (ep->id != INVALID_EVENT) {
--		if (next->id != INVALID_EVENT)
--		    continue;
--		follower = NEXT(next);
--		if (follower->id == INVALID_EVENT)
--		    continue;
--
--		/* merge click events forward */
--		if ((ep->bstate & BUTTON_CLICKED)
--		    && (follower->bstate & BUTTON_CLICKED)) {
--		    for (b = 1; b <= MAX_BUTTONS; ++b) {
--			if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b))
--			    && (follower->bstate & MASK_CLICK(b))) {
--			    follower->bstate &= ~MASK_CLICK(b);
--			    follower->bstate |= MASK_DOUBLE_CLICK(b);
--			    merge = TRUE;
--			}
-+    first_invalid = NULL;
-+    endLoop = (first_valid == NULL);
-+    ep = first_valid;
-+    while (!endLoop) {
-+	next = NEXT(ep);
-+
-+	if (next == eventp) {
-+	    /* Will end the loop, but check event type and compact before */
-+	    endLoop = TRUE;
-+	} else if (!ValidEvent(next)) {
-+	    continue;
-+	} else {
-+	    /* merge click events forward */
-+	    if ((ep->bstate & BUTTON_CLICKED)
-+		&& (next->bstate & BUTTON_CLICKED)) {
-+		merge = FALSE;
-+		for (b = 1; b <= MAX_BUTTONS; ++b) {
-+		    if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b))
-+			&& (ep->bstate & MASK_CLICK(b))
-+			&& (next->bstate & MASK_CLICK(b))) {
-+			next->bstate &= ~MASK_CLICK(b);
-+			next->bstate |= MASK_DOUBLE_CLICK(b);
-+			merge = TRUE;
- 		    }
--		    if (merge)
--			ep->id = INVALID_EVENT;
- 		}
-+		if (merge) {
-+		    Invalidate(ep);
-+		}
-+	    }
- 
--		/* merge double-click events forward */
--		if ((ep->bstate & BUTTON_DOUBLE_CLICKED)
--		    && (follower->bstate & BUTTON_CLICKED)) {
--		    for (b = 1; b <= MAX_BUTTONS; ++b) {
--			if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b))
--			    && (follower->bstate & MASK_CLICK(b))) {
--			    follower->bstate &= ~MASK_CLICK(b);
--			    follower->bstate |= MASK_TRIPLE_CLICK(b);
--			    merge = TRUE;
--			}
-+	    /* merge double-click events forward */
-+	    if ((ep->bstate & BUTTON_DOUBLE_CLICKED)
-+		&& (next->bstate & BUTTON_CLICKED)) {
-+		merge = FALSE;
-+		for (b = 1; b <= MAX_BUTTONS; ++b) {
-+		    if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b))
-+			&& (ep->bstate & MASK_DOUBLE_CLICK(b))
-+			&& (next->bstate & MASK_CLICK(b))) {
-+			next->bstate &= ~MASK_CLICK(b);
-+			next->bstate |= MASK_TRIPLE_CLICK(b);
-+			merge = TRUE;
- 		    }
--		    if (merge)
--			ep->id = INVALID_EVENT;
-+		}
-+		if (merge) {
-+		    Invalidate(ep);
- 		}
- 	    }
--    } while
--	(merge);
-+	}
- 
--#ifdef TRACE
--    if (USE_TRACEF(TRACE_IEVENT)) {
--	_trace_slot(sp, "before mouse event queue compaction:");
--	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		RunParams(sp, eventp, runp),
--		runcount);
--	_nc_unlock_global(tracef);
--    }
--#endif /* TRACE */
-+	/* Discard event if it does not match event mask */
-+	if (!(ep->bstate & sp->_mouse_mask2)) {
-+	    Invalidate(ep);
-+	}
- 
--    /*
--     * Now try to throw away trailing events flagged invalid, or that
--     * don't match the current event mask.
--     */
--    for (; runcount; prev = PREV(eventp), runcount--)
--	if (prev->id == INVALID_EVENT || !(prev->bstate & sp->_mouse_mask)) {
--	    sp->_mouse_eventp = eventp = prev;
-+	/* Compact valid events */
-+	if (!ValidEvent(ep)) {
-+	    if (ep == first_valid) {
-+		first_valid = next;
-+	    } else if (first_invalid == NULL) {
-+		first_invalid = ep;
-+	    }
-+	} else if (first_invalid != NULL) {
-+	    *first_invalid = *ep;
-+	    Invalidate(ep);
-+	    first_invalid = NEXT(first_invalid);
- 	}
-+
-+	ep = next;
-+    }
-+
-+    if (first_invalid == NULL) {
-+	first_invalid = eventp;
-+    }
-+    sp->_mouse_eventp = first_invalid;
-+
- #ifdef TRACE
--    if (USE_TRACEF(TRACE_IEVENT)) {
--	_trace_slot(sp, "after mouse event queue compaction:");
--	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		RunParams(sp, eventp, runp),
--		runcount);
--	_nc_unlock_global(tracef);
-+    if (first_valid != NULL) {
-+	if (USE_TRACEF(TRACE_IEVENT)) {
-+	    _trace_slot(sp, "after mouse event queue compaction:");
-+	    _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
-+		    RunParams(sp, first_invalid, first_valid),
-+		    runcount);
-+	    _nc_unlock_global(tracef);
-+	}
-+	for (ep = first_valid; ep != first_invalid; ep = NEXT(ep)) {
-+	    if (ValidEvent(ep))
-+		TR(MY_TRACE,
-+		   ("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
-+		    _nc_tracemouse(sp, ep),
-+		    (long) IndexEV(sp, ep)));
-+	}
-     }
--    for (ep = runp; ep != eventp; ep = NEXT(ep))
--	if (ep->id != INVALID_EVENT)
--	    TR(MY_TRACE,
--	       ("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
--		_nc_tracemouse(sp, ep),
--		(long) IndexEV(sp, ep)));
- #endif /* TRACE */
- 
-     /* after all this, do we have a valid event? */
--    return (PREV(eventp)->id != INVALID_EVENT);
-+    return ValidEvent(PREV(first_invalid));
- }
- 
- static void
-@@ -1359,7 +1455,16 @@
- 	/* compute the current-event pointer */
- 	MEVENT *prev = PREV(eventp);
- 
--	if (prev->id != INVALID_EVENT) {
-+	/*
-+	 * Discard events not matching mask (there could be still some if
-+	 * _nc_mouse_parse was not called, e.g., when _nc_mouse_inline returns
-+	 * false).
-+	 */
-+	while (ValidEvent(prev) && (!(prev->bstate & SP_PARM->_mouse_mask2))) {
-+	    Invalidate(prev);
-+	    prev = PREV(prev);
-+	}
-+	if (ValidEvent(prev)) {
- 	    /* copy the event we find there */
- 	    *aevent = *prev;
- 
-@@ -1367,9 +1472,16 @@
- 			      _nc_tracemouse(SP_PARM, prev),
- 			      (long) IndexEV(SP_PARM, prev)));
- 
--	    prev->id = INVALID_EVENT;	/* so the queue slot becomes free */
--	    SP_PARM->_mouse_eventp = PREV(prev);
-+	    Invalidate(prev);	/* so the queue slot becomes free */
-+	    SP_PARM->_mouse_eventp = prev;
- 	    result = OK;
-+	} else {
-+	    /* Reset the provided event */
-+	    aevent->bstate = 0;
-+	    Invalidate(aevent);
-+	    aevent->x = 0;
-+	    aevent->y = 0;
-+	    aevent->z = 0;
- 	}
-     }
-     returnCode(result);
-@@ -1420,6 +1532,7 @@
- /* set the mouse event mask */
- {
-     mmask_t result = 0;
-+    int b;
- 
-     T((T_CALLED("mousemask(%p,%#lx,%p)"),
-        (void *) SP_PARM,
-@@ -1447,6 +1560,22 @@
- 		mouse_activate(SP_PARM, (bool) (result != 0));
- 
- 		SP_PARM->_mouse_mask = result;
-+		SP_PARM->_mouse_mask2 = result;
-+
-+		/*
-+		 * Make a mask corresponding to the states we will need to
-+		 * retain (temporarily) while building up the state that the
-+		 * user asked for.
-+		 */
-+		for (b = 1; b <= MAX_BUTTONS; ++b) {
-+		    if (SP_PARM->_mouse_mask2 & MASK_TRIPLE_CLICK(b))
-+			SP_PARM->_mouse_mask2 |= MASK_DOUBLE_CLICK(b);
-+		    if (SP_PARM->_mouse_mask2 & MASK_DOUBLE_CLICK(b))
-+			SP_PARM->_mouse_mask2 |= MASK_CLICK(b);
-+		    if (SP_PARM->_mouse_mask2 & MASK_CLICK(b))
-+			SP_PARM->_mouse_mask2 |= (MASK_PRESS(b) |
-+						  MASK_RELEASE(b));
-+		}
- 	    }
- 	}
-     }
-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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -42,17 +42,13 @@
- 
- #include <curses.priv.h>
- 
--#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
--#define _POSIX_SOURCE
--#endif
--
- #ifndef CUR
- #define CUR SP_TERMTYPE
- #endif
- 
- #include <tic.h>
- 
--MODULE_ID("$Id: lib_newterm.c,v 1.86 2010/05/20 23:25:18 tom Exp $")
-+MODULE_ID("$Id: lib_newterm.c,v 1.88 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
- 
- #ifdef USE_TERM_DRIVER
- #define NumLabels      InfoOf(SP_PARM).numlabels
-@@ -283,7 +279,8 @@
- 	    NCURSES_SP_NAME(typeahead) (NCURSES_SP_ARGx fileno(_ifp));
- #ifdef TERMIOS
- 	    SP_PARM->_use_meta = ((new_term->Ottyb.c_cflag & CSIZE) == CS8 &&
--				  !(new_term->Ottyb.c_iflag & ISTRIP));
-+				  !(new_term->Ottyb.c_iflag & ISTRIP)) ||
-+		USE_KLIBC_KBD;
- #else
- 	    SP_PARM->_use_meta = FALSE;
- #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-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>
- #include <stddef.h>
- 
--MODULE_ID("$Id: lib_newwin.c,v 1.69 2011/03/07 21:58:17 tom Exp $")
-+MODULE_ID("$Id: lib_newwin.c,v 1.71 2011/05/28 21:32:51 tom Exp $")
- 
- #define window_is(name) ((sp)->_##name == win)
- 
-@@ -141,7 +141,11 @@
-     T((T_CALLED("newwin(%p, %d,%d,%d,%d)"), (void *) SP_PARM, num_lines, num_columns,
-        begy, begx));
- 
--    if (begy < 0 || begx < 0 || num_lines < 0 || num_columns < 0)
-+    if (begy < 0
-+	|| begx < 0
-+	|| num_lines < 0
-+	|| num_columns < 0
-+	|| SP_PARM == 0)
- 	returnWin(0);
- 
-     if (num_lines == 0)
-@@ -235,10 +239,15 @@
- NCURSES_EXPORT(WINDOW *)
- subwin(WINDOW *w, int l, int c, int y, int x)
- {
-+    WINDOW *result = 0;
-+
-     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x));
--    T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));
-+    if (w != 0) {
-+	T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));
- 
--    returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx));
-+	result = derwin(w, l, c, y - w->_begy, x - w->_begx);
-+    }
-+    returnWin(result);
- }
- 
- 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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 <curses.priv.h>
- 
--MODULE_ID("$Id: lib_refresh.c,v 1.44 2010/12/19 01:22:58 tom Exp $")
-+MODULE_ID("$Id: lib_refresh.c,v 1.45 2011/06/25 19:02:22 Vassili.Courzakis Exp $")
- 
- NCURSES_EXPORT(int)
- wrefresh(WINDOW *win)
-@@ -90,12 +90,6 @@
- #endif
- 
-     T((T_CALLED("wnoutrefresh(%p)"), (void *) win));
--#ifdef TRACE
--    if (USE_TRACEF(TRACE_UPDATE)) {
--	_tracedump("...win", win);
--	_nc_unlock_global(tracef);
--    }
--#endif /* TRACE */
- 
-     /*
-      * This function will break badly if we try to refresh a pad.
-@@ -104,6 +98,13 @@
- 	|| (win->_flags & _ISPAD))
- 	returnCode(ERR);
- 
-+#ifdef TRACE
-+    if (USE_TRACEF(TRACE_UPDATE)) {
-+	_tracedump("...win", win);
-+	_nc_unlock_global(tracef);
-+    }
-+#endif /* TRACE */
-+
-     /* put them here so "win == 0" won't break our code */
-     begx = win->_begx;
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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,11 +41,7 @@
- 
- #include <curses.priv.h>
- 
--#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
--#define _POSIX_SOURCE
--#endif
--
--MODULE_ID("$Id: lib_restart.c,v 1.13 2009/10/24 22:47:43 tom Exp $")
-+MODULE_ID("$Id: lib_restart.c,v 1.14 2011/04/16 16:42:10 tom Exp $")
- 
- NCURSES_EXPORT(int)
- 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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,14 +40,14 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_scanw.c,v 1.12 2009/10/24 22:35:14 tom Exp $")
-+MODULE_ID("$Id: lib_scanw.c,v 1.13 2011/10/22 16:31:35 tom Exp $")
- 
- NCURSES_EXPORT(int)
- vwscanw(WINDOW *win, NCURSES_CONST char *fmt, va_list argp)
- {
-     char buf[BUFSIZ];
- 
--    if (wgetnstr(win, buf, sizeof(buf) - 1) == ERR)
-+    if (wgetnstr(win, buf, (int) sizeof(buf) - 1) == ERR)
- 	return (ERR);
- 
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_screen.c,v 1.38 2009/10/24 22:08:55 tom Exp $")
-+MODULE_ID("$Id: lib_screen.c,v 1.41 2011/10/22 15:03:11 tom Exp $")
- 
- #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
- 
-@@ -51,8 +51,11 @@
- 
-     T((T_CALLED("getwin(%p)"), (void *) filep));
- 
-+    if (filep == 0) {
-+	returnWin(0);
-+    }
-     clearerr(filep);
--    if (fread(&tmp, 1, sizeof(WINDOW), filep) < sizeof(WINDOW)
-+    if (fread(&tmp, (size_t) 1, sizeof(WINDOW), filep) < sizeof(WINDOW)
- 	|| ferror(filep)
- 	|| tmp._maxy == 0
- 	|| tmp._maxy > MAX_SIZE
-@@ -110,7 +113,7 @@
- 
- 	for (n = 0; n <= nwin->_maxy; n++) {
- 	    clearerr(filep);
--	    if (fread(nwin->_line[n].text, 1, linesize, filep) < linesize
-+	    if (fread(nwin->_line[n].text, (size_t) 1, linesize, filep) < linesize
- 		|| ferror(filep)) {
- 		delwin(nwin);
- 		returnWin(0);
-@@ -141,7 +144,7 @@
- 	size_t len = (size_t) (win->_maxx + 1);
- 
- 	clearerr(filep);
--	if (fwrite(win, sizeof(WINDOW), 1, filep) != 1
-+	if (fwrite(win, sizeof(WINDOW), (size_t) 1, filep) != 1
- 	    || ferror(filep))
- 	      returnCode(code);
- 
-@@ -189,18 +192,20 @@
- NCURSES_EXPORT(int)
- scr_dump(const char *file)
- {
-+    int result;
-     FILE *fp = 0;
- 
-     T((T_CALLED("scr_dump(%s)"), _nc_visbuf(file)));
- 
-     if (_nc_access(file, W_OK) < 0
- 	|| (fp = fopen(file, "wb")) == 0) {
--	returnCode(ERR);
-+	result = ERR;
-     } else {
- 	(void) putwin(newscr, fp);
- 	(void) fclose(fp);
--	returnCode(OK);
-+	result = OK;
-     }
-+    returnCode(result);
- }
- 
- 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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,13 +43,13 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_scroll.c,v 1.28 2010/12/19 01:48:09 tom Exp $")
-+MODULE_ID("$Id: lib_scroll.c,v 1.29 2011/10/22 16:34:50 tom Exp $")
- 
- NCURSES_EXPORT(void)
- _nc_scroll_window(WINDOW *win,
- 		  int const n,
--		  NCURSES_SIZE_T const top,
--		  NCURSES_SIZE_T const bottom,
-+		  int const top,
-+		  int const bottom,
- 		  NCURSES_CH_T blank)
- {
-     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-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-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            *
-@@ -47,7 +47,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--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.141 2012/07/07 20:37:40 tom Exp $")
- 
- #ifdef USE_TERM_DRIVER
- #define MaxColors      InfoOf(sp).maxcolors
-@@ -284,7 +284,7 @@
- 				     int slines,
- 				     int scolumns,
- 				     FILE *output,
--				     bool filtered,
-+				     int filtered,
- 				     int slk_format)
- {
-     char *env;
-@@ -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,
- 		FILE *output,
--		bool filtered,
-+		int filtered,
- 		int slk_format)
- {
-     SCREEN *sp = 0;
-@@ -759,6 +760,7 @@
- 			     int line,
- 			     int (*init) (WINDOW *, int))
- {
-+    START_TRACE();
-     return NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx
- 					    (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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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: lib_slkset.c,v 1.21 2010/12/25 23:43:58 tom Exp $")
-+MODULE_ID("$Id: lib_slkset.c,v 1.22 2011/10/22 16:58:26 tom Exp $")
- 
- NCURSES_EXPORT(int)
- NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
-@@ -111,8 +111,8 @@
-     slk->ent[i].ent_text[numchrs] = '\0';
- 
-     if ((slk->ent[i].form_text = (char *) _nc_doalloc(slk->ent[i].form_text,
--						      (unsigned) (limit +
--								  numchrs + 1))
-+						      (size_t) (limit +
-+								numchrs + 1))
- 	) == 0)
- 	returnCode(ERR);
- 
-@@ -131,16 +131,16 @@
-     if (offset <= 0)
- 	offset = 0;
-     else
--	memset(slk->ent[i].form_text, ' ', (unsigned) offset);
-+	memset(slk->ent[i].form_text, ' ', (size_t) offset);
- 
-     memcpy(slk->ent[i].form_text + offset,
- 	   slk->ent[i].ent_text,
--	   (unsigned) numchrs);
-+	   (size_t) numchrs);
- 
-     if (offset < limit) {
- 	memset(slk->ent[i].form_text + offset + numchrs,
- 	       ' ',
--	       (unsigned) (limit - (offset + numcols)));
-+	       (size_t) (limit - (offset + numcols)));
-     }
- 
-     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-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-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 <curses.priv.h>
- 
--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.16 2012/08/04 17:38:53 tom Exp $")
- 
- #include <fifo_defs.h>
- 
-@@ -64,13 +64,14 @@
- 
-     T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
- 
--    if (tail != -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-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
- #endif
- 
--MODULE_ID("$Id: resizeterm.c,v 1.43 2011/01/10 01:34:49 tom Exp $")
-+MODULE_ID("$Id: resizeterm.c,v 1.45 2012/07/07 17:07:23 tom Exp $")
- 
- /*
-  * If we're trying to be reentrant, do not want any local statics.
-@@ -365,58 +365,71 @@
- 	}
- #endif
- 	if (ToLines > screen_lines(SP_PARM)) {
--	    increase_size(NCURSES_SP_ARGx
--			  myLines = ToLines, myCols, was_stolen EXTRA_ARGS);
-+	    result = increase_size(NCURSES_SP_ARGx
-+				   myLines = ToLines,
-+				   myCols,
-+				   was_stolen EXTRA_ARGS);
- 	    CurLines = myLines;
- 	    CurCols = myCols;
- 	}
- 
--	if (ToCols > screen_columns(SP_PARM)) {
--	    increase_size(NCURSES_SP_ARGx
--			  myLines, myCols = ToCols, was_stolen EXTRA_ARGS);
-+	if ((result == OK)
-+	    && (ToCols > screen_columns(SP_PARM))) {
-+	    result = increase_size(NCURSES_SP_ARGx
-+				   myLines,
-+				   myCols = ToCols,
-+				   was_stolen EXTRA_ARGS);
- 	    CurLines = myLines;
- 	    CurCols = myCols;
- 	}
- 
--	if (ToLines < myLines ||
--	    ToCols < myCols) {
--	    decrease_size(NCURSES_SP_ARGx ToLines, ToCols, was_stolen EXTRA_ARGS);
-+	if ((result == OK)
-+	    && (ToLines < myLines ||
-+		ToCols < myCols)) {
-+	    result = decrease_size(NCURSES_SP_ARGx
-+				   ToLines,
-+				   ToCols,
-+				   was_stolen EXTRA_ARGS);
- 	}
- 
--	screen_lines(SP_PARM) = (NCURSES_SIZE_T) ToLines;
--	screen_columns(SP_PARM) = (NCURSES_SIZE_T) ToCols;
-+	if (result == OK) {
-+	    screen_lines(SP_PARM) = (NCURSES_SIZE_T) ToLines;
-+	    screen_columns(SP_PARM) = (NCURSES_SIZE_T) ToCols;
- 
- #ifdef USE_TERM_DRIVER
--	CallDriver_2(SP_PARM, setsize, ToLines, ToCols);
-+	    CallDriver_2(SP_PARM, setsize, ToLines, ToCols);
- #else
--	lines = (NCURSES_SIZE_T) ToLines;
--	columns = (NCURSES_SIZE_T) ToCols;
-+	    lines = (NCURSES_SIZE_T) ToLines;
-+	    columns = (NCURSES_SIZE_T) ToCols;
- #endif
- 
--	SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen);
-+	    SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen);
- 
--	if (SP_PARM->oldhash) {
--	    FreeAndNull(SP_PARM->oldhash);
--	}
--	if (SP_PARM->newhash) {
--	    FreeAndNull(SP_PARM->newhash);
--	}
-+	    if (SP_PARM->oldhash) {
-+		FreeAndNull(SP_PARM->oldhash);
-+	    }
-+	    if (SP_PARM->newhash) {
-+		FreeAndNull(SP_PARM->newhash);
-+	    }
- #ifdef TRACE
--	if (USE_TRACEF(TRACE_UPDATE)) {
--	    SET_LINES(ToLines - was_stolen);
--	    SET_COLS(ToCols);
--	    show_window_sizes("after");
--	    _nc_unlock_global(tracef);
--	}
-+	    if (USE_TRACEF(TRACE_UPDATE)) {
-+		SET_LINES(ToLines - was_stolen);
-+		SET_COLS(ToCols);
-+		show_window_sizes("after");
-+		_nc_unlock_global(tracef);
-+	    }
- #endif
-+	}
-     }
- 
--    /*
--     * Always update LINES, to allow for call from lib_doupdate.c which
--     * needs to have the count adjusted by the stolen (ripped off) lines.
--     */
--    SET_LINES(ToLines - was_stolen);
--    SET_COLS(ToCols);
-+    if (result == OK) {
-+	/*
-+	 * Always update LINES, to allow for call from lib_doupdate.c which
-+	 * needs to have the count adjusted by the stolen (ripped off) lines.
-+	 */
-+	SET_LINES(ToLines - was_stolen);
-+	SET_COLS(ToCols);
-+    }
- 
-     _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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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>
- 
--MODULE_ID("$Id: wresize.c,v 1.34 2010/06/05 22:36:26 tom Exp $")
-+MODULE_ID("$Id: wresize.c,v 1.35 2011/05/21 18:55:07 tom Exp $")
- 
- static int
- cleanup_lines(struct ldat *data, int length)
-@@ -175,9 +175,10 @@
- 		for (col = 0; col <= ToCols; ++col)
- 		    s[col] = win->_nc_bkgd;
- 	    }
--	} else {
--	    assert(pline != 0);
-+	} else if (pline != 0 && pline[win->_pary + row].text != 0) {
- 	    s = &pline[win->_pary + row].text[win->_parx];
-+	} else {
-+	    s = 0;
- 	}
- 
- 	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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -34,7 +34,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: curses.priv.h,v 1.475 2011/01/22 21:10:19 tom Exp $
-+ * $Id: curses.priv.h,v 1.502 2012/07/14 21:14:30 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -65,6 +65,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- 
- #if HAVE_UNISTD_H
- #include <unistd.h>
-@@ -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
- 
-+/* kLIBC keyboard/mouse support */
-+#if defined(__OS2__) && defined(__KLIBC__)
-+#define USE_KLIBC_KBD   1
-+#define USE_KLIBC_MOUSE 1
-+#else
-+#define USE_KLIBC_KBD   0
-+#define USE_KLIBC_MOUSE 0
-+#endif
-+
- #define DEFAULT_MAXCLICK 166
- #define EV_MAX		8	/* size of mouse circular event queue */
- 
-@@ -192,6 +210,18 @@
- #endif
- 
- /*
-+ * Either/both S_ISxxx and/or S_IFxxx are defined in sys/types.h; some systems
-+ * lack one or the other.
-+ */
-+#ifndef S_ISDIR
-+#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)
-+#endif
-+
-+#ifndef S_ISREG
-+#define S_ISREG(mode) ((mode & S_IFMT) == S_IFREG)
-+#endif
-+
-+/*
-  * Scroll hints are useless when hashmap is used
-  */
- #if !USE_SCROLL_HINTS
-@@ -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
- 
- #include <term.h>
-+#include <nc_termios.h>
- 
- /*
-  * Reduce dependency on cur_term global by using terminfo data from SCREEN's
-@@ -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
- 
-+typedef struct {
-+    const char *name;
-+    char *value;
-+} ITERATOR_VARS;
-+
- /*
-  * Global data which is not specific to a screen.
-  */
-@@ -776,7 +820,7 @@
- 	bool		init_signals;
- 	bool		init_screen;
- 
--	const char	*comp_sourcename;
-+	char		*comp_sourcename;
- 	char		*comp_termtype;
- 
- 	bool		have_tic_directory;
-@@ -798,6 +842,12 @@
- 	int		tgetent_index;
- 	long		tgetent_sequence;
- 
-+	char		*dbd_blob;	/* string-heap for dbd_list[] */
-+	char		**dbd_list;	/* distinct places to look for data */
-+	int		dbd_size;	/* length of dbd_list[] */
-+	time_t		dbd_time;	/* cache last updated */
-+	ITERATOR_VARS	dbd_vars[dbdLAST];
-+
- #ifndef USE_SP_WINDOWLIST
- 	WINDOWLIST	*_nc_windowlist;
- #define WindowList(sp)	_nc_globals._nc_windowlist
-@@ -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       */
- #if NCURSES_EXT_FUNCS
-+	bool		_assumed_color; /* use assumed colors		     */
- 	bool		_default_color; /* use default colors		     */
- 	bool		_has_sgr_39_49; /* has ECMA default color support    */
- 	int		_default_fg;	/* assumed default foreground	     */
-@@ -1032,6 +1084,10 @@
- 	bool		_use_rmso;	/* true if we may use 'rmso'	     */
- 	bool		_use_rmul;	/* true if we may use 'rmul'	     */
- 
-+#if USE_KLIBC_KBD
-+	bool		_extended_key;	/* true if an extended key	     */
-+#endif
-+
- 	/*
- 	 * These data correspond to the state of the idcok() and idlok()
- 	 * functions.  A caveat is in order here:  the XSI and SVr4
-@@ -1055,7 +1111,9 @@
- 	void		(*_mouse_wrap)	(SCREEN *);
- 	int		_mouse_fd;	/* file-descriptor, if any */
- 	bool		_mouse_active;	/* true if initialized */
--	mmask_t		_mouse_mask;
-+	mmask_t		_mouse_mask;	/* set via mousemask() */
-+	mmask_t		_mouse_mask2;	/* OR's in press/release bits */
-+	mmask_t		_mouse_bstate;
- 	NCURSES_CONST char *_mouse_xtermcap; /* string to enable/disable mouse */
- 	MEVENT		_mouse_events[EV_MAX];	/* hold the last mouse event seen */
- 	MEVENT		*_mouse_eventp;	/* next free slot in event queue */
-@@ -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 */
- 	WINDOW	win;		/* WINDOW_EXT() needs to account for offset */
--#ifdef NCURSES_WIDECHAR
-+#if NCURSES_WIDECHAR
- 	char addch_work[(MB_LEN_MAX * 9) + 1];
- 	unsigned addch_used;	/* number of bytes in addch_work[] */
- 	int addch_x;		/* x-position for addch_work[] */
-@@ -1339,7 +1400,7 @@
- 					putc(PUTC_ch,b);			    \
- 				    break;					    \
- 				}						    \
--				IGNORE_RC(fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b)); \
-+				IGNORE_RC(fwrite(PUTC_buf, (size_t) PUTC_n, (size_t) 1, b)); \
- 			    }							    \
- 			    COUNT_OUTCHARS(PUTC_i);				    \
- 			} } } while (0)
-@@ -1412,25 +1473,25 @@
- 
- #define CHANGED_CELL(line,col) \
- 	if (line->firstchar == _NOCHANGE) \
--		line->firstchar = line->lastchar = (NCURSES_SIZE_T) col; \
-+		line->firstchar = line->lastchar = (NCURSES_SIZE_T) (col); \
- 	else if ((col) < line->firstchar) \
--		line->firstchar = (NCURSES_SIZE_T) col; \
-+		line->firstchar = (NCURSES_SIZE_T) (col); \
- 	else if ((col) > line->lastchar) \
--		line->lastchar = (NCURSES_SIZE_T) col
-+		line->lastchar = (NCURSES_SIZE_T) (col)
- 
- #define CHANGED_RANGE(line,start,end) \
- 	if (line->firstchar == _NOCHANGE \
- 	 || line->firstchar > (start)) \
--		line->firstchar = (NCURSES_SIZE_T) start; \
-+		line->firstchar = (NCURSES_SIZE_T) (start); \
- 	if (line->lastchar == _NOCHANGE \
- 	 || line->lastchar < (end)) \
--		line->lastchar = (NCURSES_SIZE_T) end
-+		line->lastchar = (NCURSES_SIZE_T) (end)
- 
- #define CHANGED_TO_EOL(line,start,end) \
- 	if (line->firstchar == _NOCHANGE \
- 	 || line->firstchar > (start)) \
--		line->firstchar = (NCURSES_SIZE_T) start; \
--	line->lastchar = (NCURSES_SIZE_T) end
-+		line->firstchar = (NCURSES_SIZE_T) (start); \
-+	line->lastchar = (NCURSES_SIZE_T) (end)
- 
- #define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
- 
-@@ -1528,7 +1589,7 @@
- #define returnVoidPtr(code)	TRACE_RETURN(code,void_ptr)
- #define returnWin(code)		TRACE_RETURN(code,win)
- 
--extern NCURSES_EXPORT(NCURSES_BOOL)     _nc_retrace_bool (NCURSES_BOOL);
-+extern NCURSES_EXPORT(NCURSES_BOOL)     _nc_retrace_bool (int);
- extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *);
- extern NCURSES_EXPORT(SCREEN *)         _nc_retrace_sp (SCREEN *);
- extern NCURSES_EXPORT(WINDOW *)         _nc_retrace_win (WINDOW *);
-@@ -1539,7 +1600,7 @@
- extern NCURSES_EXPORT(chtype)           _nc_retrace_chtype (chtype);
- extern NCURSES_EXPORT(const char *)     _nc_altcharset_name(attr_t, chtype);
- extern NCURSES_EXPORT(const char *)     _nc_retrace_cptr (const char *);
--extern NCURSES_EXPORT(char)             _nc_retrace_char (char);
-+extern NCURSES_EXPORT(char)             _nc_retrace_char (int);
- extern NCURSES_EXPORT(int)              _nc_retrace_int (int);
- 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 +1877,31 @@
- extern NCURSES_EXPORT(char *) _nc_get_locale(void);
- extern NCURSES_EXPORT(int)    _nc_unicode_locale(void);
- extern NCURSES_EXPORT(int)    _nc_locale_breaks_acs(TERMINAL *);
--extern NCURSES_EXPORT(int)    _nc_setupterm(NCURSES_CONST char *, int, int *, bool);
--extern NCURSES_EXPORT(void)   _nc_tinfo_cmdch(TERMINAL *, char);
-+extern NCURSES_EXPORT(int)    _nc_setupterm(NCURSES_CONST char *, int, int *, int);
-+extern NCURSES_EXPORT(void)   _nc_tinfo_cmdch(TERMINAL *, int);
- 
- /* lib_set_term.c */
- extern NCURSES_EXPORT(int)    _nc_ripoffline(int, int(*)(WINDOW*, int));
- 
-+/* lib_setup.c */
-+#define ret_error(code, fmt, arg)	if (errret) {\
-+					    *errret = code;\
-+					    returnCode(ERR);\
-+					} else {\
-+					    fprintf(stderr, fmt, arg);\
-+					    exit(EXIT_FAILURE);\
-+					}
-+
-+#define ret_error1(code, fmt, arg)	ret_error(code, "'%s': " fmt, arg)
-+
-+#define ret_error0(code, msg)		if (errret) {\
-+					    *errret = code;\
-+					    returnCode(ERR);\
-+					} else {\
-+					    fprintf(stderr, msg);\
-+					    exit(EXIT_FAILURE);\
-+					}
-+
- /* lib_tstp.c */
- #if USE_SIGWINCH
- extern NCURSES_EXPORT(int) _nc_handle_sigwinch(SCREEN *);
-@@ -1875,16 +1955,16 @@
- extern NCURSES_EXPORT(int) _nc_baudrate (int);
- extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
- extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool);
-+extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, int);
- extern NCURSES_EXPORT(int) _nc_ospeed (int);
- extern NCURSES_EXPORT(int) _nc_outch (int);
- extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *);
- extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *);
- 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_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
--extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, NCURSES_OUTC);
-+extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
- extern NCURSES_EXPORT(void) _nc_flush (void);
- extern NCURSES_EXPORT(void) _nc_free_and_exit (int) GCC_NORETURN;
- extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE *);
-@@ -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);
- extern NCURSES_EXPORT(void) _nc_scroll_optimize (void);
--extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool);
--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 *);
- 
-@@ -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);
- extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);
- extern NCURSES_EXPORT(void) _nc_names_leaks(void);
- extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
-@@ -1914,7 +1997,7 @@
- #if !(defined(USE_TERMLIB) || defined(USE_BUILD_CC))
- extern NCURSES_EXPORT(NCURSES_CH_T) _nc_render (WINDOW *, NCURSES_CH_T);
- extern NCURSES_EXPORT(int) _nc_waddch_nosync (WINDOW *, const NCURSES_CH_T);
--extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE_T const, NCURSES_SIZE_T const, NCURSES_CH_T);
-+extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, int const, int const, NCURSES_CH_T);
- #endif
- 
- #if USE_WIDEC_SUPPORT
-@@ -1947,7 +2030,7 @@
-  */
- #if USE_WIDEC_SUPPORT
- #if HAVE_MBTOWC && HAVE_MBLEN
--#define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
-+#define reset_mbytes(state) IGNORE_RC(mblen(NULL, (size_t) 0)), IGNORE_RC(mbtowc(NULL, NULL, (size_t) 0))
- #define count_mbytes(buffer,length,state) mblen(buffer,length)
- #define check_mbytes(wch,buffer,length,state) \
- 	(int) mbtowc(&wch, buffer, length)
-@@ -2084,39 +2167,39 @@
- 
- typedef struct term_driver {
-     bool   isTerminfo;
--    bool   (*CanHandle)(struct DriverTCB*,const char*,int*);
-+    bool   (*CanHandle)(struct DriverTCB*, const char*, int*);
-     void   (*init)(struct DriverTCB*);
-     void   (*release)(struct DriverTCB*);
-     int    (*size)(struct DriverTCB*, int* Line, int *Cols);
--    int    (*sgmode)(struct DriverTCB*, bool setFlag, TTY*);
-+    int    (*sgmode)(struct DriverTCB*, int setFlag, TTY*);
-     chtype (*conattr)(struct DriverTCB*);
-     int    (*hwcur)(struct DriverTCB*, int yold, int xold, int y, int x);
--    int    (*mode)(struct DriverTCB*, bool progFlag, bool defFlag);
-+    int    (*mode)(struct DriverTCB*, int progFlag, int defFlag);
-     bool   (*rescol)(struct DriverTCB*);
-     bool   (*rescolors)(struct DriverTCB*);
--    void   (*color)(struct DriverTCB*,bool fore, int color, int(*)(SCREEN*,int));
--    int    (*doBeepOrFlash)(struct DriverTCB*, bool);
--    void   (*initpair)(struct DriverTCB*,short,short,short);
--    void   (*initcolor)(struct DriverTCB*,short,short,short,short);
--    void   (*docolor)(struct DriverTCB*,short,short,bool,int(*)(SCREEN*,int));
-+    void   (*color)(struct DriverTCB*, int fore, int color, int(*)(SCREEN*, int));
-+    int    (*doBeepOrFlash)(struct DriverTCB*, int);
-+    void   (*initpair)(struct DriverTCB*, int, int, int);
-+    void   (*initcolor)(struct DriverTCB*, int, int, int, int);
-+    void   (*docolor)(struct DriverTCB*, int, int, int, int(*)(SCREEN*, int));
-     void   (*initmouse)(struct DriverTCB*);
--    int    (*testmouse)(struct DriverTCB*,int);
-+    int    (*testmouse)(struct DriverTCB*, int EVENTLIST_2nd(_nc_eventlist*));
-     void   (*setfilter)(struct DriverTCB*);
--    void   (*hwlabel)(struct DriverTCB*,int,char*);
--    void   (*hwlabelOnOff)(struct DriverTCB*,bool);
-+    void   (*hwlabel)(struct DriverTCB*, int, char*);
-+    void   (*hwlabelOnOff)(struct DriverTCB*, int);
-     int    (*update)(struct DriverTCB*);
--    int    (*defaultcolors)(struct DriverTCB*,int,int);
--    int    (*print)(struct DriverTCB*,char*,int);
--    int    (*getsize)(struct DriverTCB*,int*,int*);
--    int    (*setsize)(struct DriverTCB*,int,int);
--    void   (*initacs)(struct DriverTCB*,chtype*,chtype*);
-+    int    (*defaultcolors)(struct DriverTCB*, int, int);
-+    int    (*print)(struct DriverTCB*, char*, int);
-+    int    (*getsize)(struct DriverTCB*, int*, int*);
-+    int    (*setsize)(struct DriverTCB*, int, int);
-+    void   (*initacs)(struct DriverTCB*, chtype*, chtype*);
-     void   (*scinit)(SCREEN *);
-     void   (*scexit)(SCREEN *);
--    int    (*twait)(struct DriverTCB*,int,int,int* EVENTLIST_2nd(_nc_eventlist*));
--    int    (*read)(struct DriverTCB*,int*);
--    int    (*nap)(struct DriverTCB*,int);
--    int    (*kpad)(struct DriverTCB*, bool);
--    int    (*kyOk)(struct DriverTCB*, int, bool);
-+    int    (*twait)(struct DriverTCB*, int, int, int* EVENTLIST_2nd(_nc_eventlist*));
-+    int    (*read)(struct DriverTCB*, int*);
-+    int    (*nap)(struct DriverTCB*, int);
-+    int    (*kpad)(struct DriverTCB*, int);
-+    int    (*kyOk)(struct DriverTCB*, int, int);
-     bool   (*kyExist)(struct DriverTCB*, int);
- } TERM_DRIVER;
- 
-@@ -2174,7 +2257,7 @@
-  */
- #ifdef USE_TERM_DRIVER
- extern NCURSES_EXPORT(void)   _nc_get_screensize(SCREEN *, TERMINAL *, int *, int *);
--extern NCURSES_EXPORT(int)    _nc_setupterm_ex(TERMINAL **, NCURSES_CONST char *, int , int *, bool);
-+extern NCURSES_EXPORT(int)    _nc_setupterm_ex(TERMINAL **, NCURSES_CONST char *, int , int *, int);
- #define TINFO_GET_SIZE(sp, tp, lp, cp) \
- 	_nc_get_screensize(sp, tp, lp, cp)
- #define TINFO_SET_CURTERM(sp, tp) \
-@@ -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);
- extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*);
--extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int);
-+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int);
- extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *);
- extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*);
- extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vid_attr)(SCREEN *, attr_t, short, void *);
- extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int));
--extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_color)(SCREEN*, short, short, bool, NCURSES_SP_OUTC);
-+extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC);
- extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t);
- 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 +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);
- extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_scroll_optimize)(SCREEN*);
--extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_set_buffer)(SCREEN*, FILE *, bool);
-+extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_set_buffer)(SCREEN*, FILE *, int);
- 
- 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-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
- ##############################################################################
--# Copyright (c) 2007-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 2007-2010,2011 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"), #
-@@ -26,7 +26,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: MKcaptab.sh,v 1.13 2010/12/25 23:43:58 tom Exp $
-+# $Id: MKcaptab.sh,v 1.14 2011/10/22 16:34:50 tom Exp $
- AWK=${1-awk}
- OPT1=${2-0}
- OPT2=${3-tinfo/MKcaptab.awk}
-@@ -99,12 +99,12 @@
- _nc_build_alias(struct alias **actual,
- 		const alias_table_data *source,
- 		const char *strings,
--		unsigned tablesize)
-+		size_t tablesize)
- {
-     if (*actual == 0) {
- 	*actual = typeCalloc(struct alias, tablesize + 1);
- 	if (*actual != 0) {
--	    unsigned n;
-+	    size_t n;
- 	    for (n = 0; n < tablesize; ++n) {
- 		add_alias(from);
- 		add_alias(to);
-@@ -178,7 +178,7 @@
- static int
- compare_tcap_names(const char *a, const char *b)
- {
--    return !strncmp(a, b, TCAP_LEN);
-+    return !strncmp(a, b, (size_t) TCAP_LEN);
- }
- 
- 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-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-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,11 +33,18 @@
- #include <curses.priv.h>
- 
- #include <ctype.h>
--#include <sys/stat.h>
- 
- #include <tic.h>
- 
--MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $")
-+MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $")
-+
-+#ifdef __TANDEM
-+#define ROOT_UID 65535
-+#endif
-+
-+#ifndef ROOT_UID
-+#define ROOT_UID 0
-+#endif
- 
- #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
- 
-@@ -108,24 +115,33 @@
- NCURSES_EXPORT(int)
- _nc_access(const char *path, int mode)
- {
--    if (access(path, mode) < 0) {
-+    int result;
-+
-+    if (path == 0) {
-+	result = -1;
-+    } else if (access(path, mode) < 0) {
- 	if ((mode & W_OK) != 0
- 	    && errno == ENOENT
- 	    && strlen(path) < PATH_MAX) {
- 	    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, ".");
-+		_nc_STRCPY(head, ".", sizeof(head));
- 
--	    return access(head, R_OK | W_OK | X_OK);
-+	    result = access(head, R_OK | W_OK | X_OK);
-+	} else {
-+	    result = -1;
- 	}
--	return -1;
-+    } else {
-+	result = 0;
-     }
--    return 0;
-+    return result;
- }
- 
- NCURSES_EXPORT(bool)
-@@ -135,7 +151,7 @@
-     struct stat sb;
- 
-     if (stat(path, &sb) == 0
--	&& (sb.st_mode & S_IFMT) == S_IFDIR) {
-+	&& S_ISDIR(sb.st_mode)) {
- 	result = TRUE;
-     }
-     return result;
-@@ -148,7 +164,7 @@
-     struct stat sb;
- 
-     if (stat(path, &sb) == 0
--	&& (sb.st_mode & S_IFMT) == S_IFREG) {
-+	&& S_ISREG(sb.st_mode)) {
- 	result = TRUE;
-     }
-     return result;
-@@ -170,6 +186,7 @@
- 	|| getgid() != getegid())
- 	return FALSE;
- #endif
--    return getuid() != 0 && geteuid() != 0;	/* ...finally, disallow root */
-+    /* ...finally, disallow root */
-+    return (getuid() != ROOT_UID) && (geteuid() != ROOT_UID);
- }
- #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-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-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            *
-@@ -47,7 +47,7 @@
- 
- #include <tic.h>
- 
--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.56 2012/02/22 22:34:31 tom Exp $")
- 
- #define ABSENT_OFFSET    -1
- #define CANCELLED_OFFSET -2
-@@ -73,7 +73,7 @@
- #endif
- 
-     if (stringbuf == 0)
--	stringbuf = (char *) malloc(MAX_STRTAB);
-+	stringbuf = (char *) malloc((size_t) MAX_STRTAB);
- 
- #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-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-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            *
-@@ -93,7 +93,7 @@
- #include <ctype.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: captoinfo.c,v 1.58 2010/12/04 20:08:19 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 @@
- 	else if (parm == 2)
- 	    parm = 1;
-     }
-+
-+    while (n--) {
-+	dp = save_string(dp, "%p");
-+	dp = save_char(dp, '0' + parm);
-+    }
-+
-     if (onstack == parm) {
- 	if (n > 1) {
- 	    _nc_warning("string may not be optimal");
-@@ -255,11 +261,6 @@
- 
-     onstack = parm;
- 
--    while (n--) {
--	dp = save_string(dp, "%p");
--	dp = save_char(dp, '0' + parm);
--    }
--
-     if (seenn && parm < 3) {
- 	dp = save_string(dp, "%{96}%^");
-     }
-@@ -469,73 +470,9 @@
- 		break;
- 	    }
- 	    break;
--#ifdef REVISIBILIZE
--	case '\\':
--	    dp = save_char(dp, *s++);
--	    dp = save_char(dp, *s++);
--	    break;
--	case '\n':
--	    dp = save_string(dp, "\\n");
--	    s++;
--	    break;
--	case '\t':
--	    dp = save_string(dp, "\\t");
--	    s++;
--	    break;
--	case '\r':
--	    dp = save_string(dp, "\\r");
--	    s++;
--	    break;
--	case '\200':
--	    dp = save_string(dp, "\\0");
--	    s++;
--	    break;
--	case '\f':
--	    dp = save_string(dp, "\\f");
--	    s++;
--	    break;
--	case '\b':
--	    dp = save_string(dp, "\\b");
--	    s++;
--	    break;
--	case ' ':
--	    dp = save_string(dp, "\\s");
--	    s++;
--	    break;
--	case '^':
--	    dp = save_string(dp, "\\^");
--	    s++;
--	    break;
--	case ':':
--	    dp = save_string(dp, "\\:");
--	    s++;
--	    break;
--	case ',':
--	    dp = save_string(dp, "\\,");
--	    s++;
--	    break;
--	default:
--	    if (*s == '\033') {
--		dp = save_string(dp, "\\E");
--		s++;
--	    } else if (*s > 0 && *s < 32) {
--		dp = save_char(dp, '^');
--		dp = save_char(dp, *s + '@');
--		s++;
--	    } else if (*s <= 0 || *s >= 127) {
--		dp = save_char(dp, '\\');
--		dp = save_char(dp, ((*s & 0300) >> 6) + '0');
--		dp = save_char(dp, ((*s & 0070) >> 3) + '0');
--		dp = save_char(dp, (*s & 0007) + '0');
--		s++;
--	    } else
--		dp = save_char(dp, *s++);
--	    break;
--#else
- 	default:
- 	    dp = save_char(dp, *s++);
- 	    break;
--#endif
- 	}
-     }
- 
-@@ -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;
-     char ch1 = 0, ch2 = 0;
-     char *bufptr = init_string();
-+    char octal[4];
-     int len;
-     bool syntax_error = FALSE;
- 
-     /* we may have to move some trailing mandatory padding up front */
-     padding = str + strlen(str) - 1;
--    if (padding > str && *padding == '>' && *--padding == '/') {
--	--padding;
-+    if (padding > str && *padding == '>') {
-+	if (*--padding == '/')
-+	    --padding;
- 	while (isdigit(UChar(*padding)) || *padding == '.' || *padding == '*')
- 	    padding--;
- 	if (padding > str && *padding == '<' && *--padding == '$')
-@@ -663,7 +602,7 @@
- 	    bufptr = save_char(bufptr, *padding++);
-     }
- 
--    for (; *str && str != trimmed; str++) {
-+    for (; *str && ((trimmed == 0) || (str < trimmed)); str++) {
- 	int c1, c2;
- 	char *cp = 0;
- 
-@@ -685,8 +624,72 @@
- 	    } else if (str[1] == ',') {
- 		bufptr = save_char(bufptr, *++str);
- 	    } else {
-+		int xx1, xx2;
-+
- 		bufptr = save_char(bufptr, *str++);
--		bufptr = save_char(bufptr, *str);
-+		xx1 = *str;
-+		if (_nc_strict_bsd) {
-+		    if (isdigit(UChar(xx1))) {
-+			int pad = 0;
-+
-+			if (!isdigit(UChar(str[1])))
-+			    pad = 2;
-+			else if (str[1] && !isdigit(UChar(str[2])))
-+			    pad = 1;
-+
-+			/*
-+			 * Test for "\0", "\00" or "\000" and transform those
-+			 * into "\200".
-+			 */
-+			if (xx1 == '0'
-+			    && ((pad == 2) || (str[1] == '0'))
-+			    && ((pad >= 1) || (str[2] == '0'))) {
-+			    xx2 = '2';
-+			} else {
-+			    xx2 = '0';
-+			    pad = 0;	/* FIXME - optionally pad to 3 digits */
-+			}
-+			while (pad-- > 0) {
-+			    bufptr = save_char(bufptr, xx2);
-+			    xx2 = '0';
-+			}
-+		    } else if (strchr("E\\nrtbf", xx1) == 0) {
-+			switch (xx1) {
-+			case 'e':
-+			    xx1 = 'E';
-+			    break;
-+			case 'l':
-+			    xx1 = 'n';
-+			    break;
-+			case 's':
-+			    bufptr = save_char(bufptr, '0');
-+			    bufptr = save_char(bufptr, '4');
-+			    xx1 = '0';
-+			    break;
-+			case ':':
-+			    /*
-+			     * Note: termcap documentation claims that ":"
-+			     * must be escaped as "\072", however the
-+			     * documentation is incorrect - read the code.
-+			     * The replacement does not work reliably,
-+			     * so the advice is not helpful.
-+			     */
-+			    bufptr = save_char(bufptr, '0');
-+			    bufptr = save_char(bufptr, '7');
-+			    xx1 = '2';
-+			    break;
-+			default:
-+			    /* should not happen, but handle this anyway */
-+			    _nc_SPRINTF(octal, _nc_SLIMIT(sizeof(octal))
-+					"%03o", UChar(xx1));
-+			    bufptr = save_char(bufptr, octal[0]);
-+			    bufptr = save_char(bufptr, octal[1]);
-+			    xx1 = octal[2];
-+			    break;
-+			}
-+		    }
-+		}
-+		bufptr = save_char(bufptr, xx1);
- 	    }
- 	} else if (str[0] == '$' && str[1] == '<') {	/* discard padding */
- 	    str += 2;
-@@ -720,13 +723,13 @@
- 	    bufptr = save_tc_inequality(bufptr, c1, c2);
- 	} else if (sscanf(str, "%%?%%{%d}%%>%%t%%'%c'%%+%%;", &c1, &ch2) == 2) {
- 	    str = strchr(str, ';');
--	    bufptr = save_tc_inequality(bufptr, c1, c2);
-+	    bufptr = save_tc_inequality(bufptr, c1, ch2);
- 	} else if (sscanf(str, "%%?%%'%c'%%>%%t%%{%d}%%+%%;", &ch1, &c2) == 2) {
- 	    str = strchr(str, ';');
--	    bufptr = save_tc_inequality(bufptr, c1, c2);
-+	    bufptr = save_tc_inequality(bufptr, ch1, c2);
- 	} else if (sscanf(str, "%%?%%'%c'%%>%%t%%'%c'%%+%%;", &ch1, &ch2) == 2) {
- 	    str = strchr(str, ';');
--	    bufptr = save_tc_inequality(bufptr, c1, c2);
-+	    bufptr = save_tc_inequality(bufptr, ch1, ch2);
- 	} else if ((len = bcd_expression(str)) != 0) {
- 	    str += len;
- 	    bufptr = save_string(bufptr, "%B");
-@@ -741,15 +744,15 @@
- 	    bufptr = save_tc_char(bufptr, c1);
- 	}
- 	/* FIXME: this "works" for 'delta' */
--	else if (strncmp(str, "%{2}%*%-", 8) == 0) {
-+	else if (strncmp(str, "%{2}%*%-", (size_t) 8) == 0) {
- 	    str += 7;
- 	    bufptr = save_string(bufptr, "%D");
--	} else if (strncmp(str, "%{96}%^", 7) == 0) {
-+	} else if (strncmp(str, "%{96}%^", (size_t) 7) == 0) {
- 	    str += 6;
- 	    if (saw_m++ == 0) {
- 		bufptr = save_string(bufptr, "%n");
- 	    }
--	} else if (strncmp(str, "%{127}%^", 8) == 0) {
-+	} else if (strncmp(str, "%{127}%^", (size_t) 8) == 0) {
- 	    str += 7;
- 	    if (saw_n++ == 0) {
- 		bufptr = save_string(bufptr, "%m");
-@@ -772,8 +775,25 @@
- 	    case '8':
- 	    case '9':
- 		bufptr = save_char(bufptr, '%');
--		while (isdigit(UChar(*str)))
--		    bufptr = save_char(bufptr, *str++);
-+		ch1 = 0;
-+		ch2 = 0;
-+		while (isdigit(UChar(*str))) {
-+		    ch2 = ch1;
-+		    ch1 = *str++;
-+		    if (_nc_strict_bsd) {
-+			if (ch1 > '3')
-+			    return 0;
-+		    } else {
-+			bufptr = save_char(bufptr, ch1);
-+		    }
-+		}
-+		if (_nc_strict_bsd) {
-+		    if (ch2 != 0 && ch2 != '0')
-+			return 0;
-+		    if (ch1 < '2')
-+			ch1 = 'd';
-+		    bufptr = save_char(bufptr, ch1);
-+		}
- 		if (strchr("doxX.", *str)) {
- 		    if (*str != 'd')	/* termcap doesn't have octal, hex */
- 			return 0;
-@@ -794,6 +814,8 @@
- 		 * termcap notation.
- 		 */
- 	    case 's':
-+		if (_nc_strict_bsd)
-+		    return 0;
- 		bufptr = save_string(bufptr, "%s");
- 		break;
- 
-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-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-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 @@
- 
- #include <tic.h>
- 
--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.36 2012/02/22 22:34:31 tom Exp $")
- 
- NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
- NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
-@@ -59,7 +59,8 @@
- NCURSES_EXPORT(void)
- _nc_set_source(const char *const name)
- {
--    SourceName = name;
-+    FreeIfNeeded(SourceName);
-+    SourceName = strdup(name);
- }
- 
- NCURSES_EXPORT(void)
-@@ -70,7 +71,7 @@
-     if (TermType != 0) {
- 	TermType[0] = '\0';
- 	if (name)
--	    strncat(TermType, name, MAX_NAME_SIZE);
-+	    strncat(TermType, name, (size_t) MAX_NAME_SIZE);
-     }
- }
- 
-@@ -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-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-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 @@
- #include <ctype.h>
- #include <tic.h>
- 
--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.25 2012/03/24 18:37:17 tom Exp $")
- 
- static int
- trailing_spaces(const char *src)
-@@ -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;
- 
--#if NO_LEAKS
-     if (srcp == 0) {
-+#if NO_LEAKS
- 	if (buffer != 0) {
- 	    FreeAndNull(buffer);
- 	    length = 0;
- 	}
-+#endif
- 	return 0;
-     }
--#endif
-     if (buffer == 0 || need > length) {
- 	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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -35,15 +35,10 @@
- /*
-  *	comp_parse.c -- parser driver loop and use handling.
-  *
-- *	_nc_read_entry_source(FILE *, literal, bool, bool (*hook)())
-- *	_nc_resolve_uses2(void)
-- *	_nc_free_entries(void)
-- *
-  *	Use this code by calling _nc_read_entry_source() on as many source
-  *	files as you like (either terminfo or termcap syntax).  If you
-  *	want use-resolution, call _nc_resolve_uses2().  To free the list
-  *	storage, do _nc_free_entries().
-- *
-  */
- 
- #include <curses.priv.h>
-@@ -52,7 +47,7 @@
- 
- #include <tic.h>
- 
--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.85 2012/04/14 23:30:10 tom Exp $")
- 
- static void sanity_check2(TERMTYPE *, bool);
- NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
-@@ -61,6 +56,8 @@
- static void sanity_check(TERMTYPE *);
- NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
- 
-+static void fixup_acsc(TERMTYPE *, int);
-+
- static void
- enqueue(ENTRY * ep)
- /* add an entry to the in-core list */
-@@ -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)
- 
--NCURSES_EXPORT(bool)
--_nc_entry_match(char *n1, char *n2)
--/* do any of the aliases in a pair of terminal names match? */
-+#if USE_TERMCAP && NCURSES_XNAMES
-+static char *
-+skip_index(char *name)
-+{
-+    char *bar = strchr(name, '|');
-+
-+    if (bar != 0 && (bar - name) == 2)
-+	name = bar + 1;
-+
-+    return name;
-+}
-+#endif
-+
-+static bool
-+check_collisions(char *n1, char *n2, int counter)
- {
-     char *pstart, *qstart, *pend, *qend;
-     char nc1[MAX_NAME_SIZE + 2];
-@@ -104,15 +113,98 @@
-     n1 = ForceBar(nc1, n1);
-     n2 = ForceBar(nc2, n2);
- 
--    for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1)
--	for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1)
-+#if USE_TERMCAP && NCURSES_XNAMES
-+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
-+	n1 = skip_index(n1);
-+	n2 = skip_index(n2);
-+    }
-+#endif
-+
-+    for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1) {
-+	for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1) {
- 	    if ((pend - pstart == qend - qstart)
--		&& memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0)
-+		&& memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) {
-+		if (counter > 0)
-+		    (void) fprintf(stderr, "Name collision '%.*s' between\n",
-+				   (int) (pend - pstart), pstart);
- 		return (TRUE);
-+	    }
-+	}
-+    }
- 
-     return (FALSE);
- }
- 
-+static char *
-+next_name(char *name)
-+{
-+    if (*name != '\0')
-+	++name;
-+    return name;
-+}
-+
-+static char *
-+name_ending(char *name)
-+{
-+    if (*name == '\0') {
-+	name = 0;
-+    } else {
-+	while (*name != '\0' && *name != '|')
-+	    ++name;
-+    }
-+    return name;
-+}
-+
-+/*
-+ * Essentially, find the conflict reported in check_collisions() and remove
-+ * it from the second name, unless that happens to be the last alias.
-+ */
-+static bool
-+remove_collision(char *n1, char *n2)
-+{
-+    char *p1 = n1;
-+    char *p2 = n2;
-+    char *pstart, *qstart, *pend, *qend;
-+    bool removed = FALSE;
-+
-+#if USE_TERMCAP && NCURSES_XNAMES
-+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
-+	p1 = n1 = skip_index(n1);
-+	p2 = n2 = skip_index(n2);
-+    }
-+#else
-+    (void) p1;
-+#endif
-+
-+    for (pstart = n1; (pend = name_ending(pstart)); pstart = next_name(pend)) {
-+	for (qstart = n2; (qend = name_ending(qstart)); qstart = next_name(qend)) {
-+	    if ((pend - pstart == qend - qstart)
-+		&& memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) {
-+		if (qstart != p2 || *qend == '|') {
-+		    if (*qend == '|')
-+			++qend;
-+		    while ((*qstart++ = *qend++) != '\0') ;
-+		    fprintf(stderr, "...now\t%s\n", p2);
-+		} else {
-+		    fprintf(stderr, "Cannot remove alias '%.*s'\n",
-+			    (int) (qend - qstart), qstart);
-+		}
-+		removed = TRUE;
-+		break;
-+	    }
-+	}
-+    }
-+
-+    return removed;
-+}
-+
-+/* do any of the aliases in a pair of terminal names match? */
-+NCURSES_EXPORT(bool)
-+_nc_entry_match(char *n1, char *n2)
-+{
-+    return check_collisions(n1, n2, 0);
-+}
-+
- /****************************************************************************
-  *
-  * Entry compiler and resolution logic
-@@ -198,19 +290,19 @@
- 
- 	for_entry_list(rp) {
- 	    if (qp > rp
--		&& _nc_entry_match(qp->tterm.term_names, rp->tterm.term_names)) {
--		matchcount++;
--		if (matchcount == 1) {
--		    (void) fprintf(stderr, "Name collision between %s",
--				   _nc_first_name(qp->tterm.term_names));
--		    multiples++;
-+		&& check_collisions(qp->tterm.term_names,
-+				    rp->tterm.term_names,
-+				    matchcount + 1)) {
-+		if (!matchcount++) {
-+		    (void) fprintf(stderr, "\t%s\n", rp->tterm.term_names);
-+		}
-+		(void) fprintf(stderr, "and\t%s\n", qp->tterm.term_names);
-+		if (!remove_collision(rp->tterm.term_names,
-+				      qp->tterm.term_names)) {
-+		    ++multiples;
- 		}
--		if (matchcount >= 1)
--		    (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names));
- 	    }
- 	}
--	if (matchcount >= 1)
--	    (void) putc('\n', stderr);
-     }
-     if (multiples > 0)
- 	return (FALSE);
-@@ -378,7 +470,34 @@
- 	    for_entry_list(qp) {
- 		_nc_curr_line = (int) qp->startline;
- 		_nc_set_type(_nc_first_name(qp->tterm.term_names));
--		_nc_check_termtype2(&qp->tterm, literal);
-+		/*
-+		 * tic overrides this function pointer to provide more verbose
-+		 * checking.
-+		 */
-+		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);
-+		}
- 	    }
- 	    DEBUG(2, ("SANITY CHECK FINISHED"));
- 	}
-@@ -403,6 +522,17 @@
- #define CUR tp->
- 
- static void
-+fixup_acsc(TERMTYPE *tp, int literal)
-+{
-+    if (!literal) {
-+	if (acs_chars == 0
-+	    && enter_alt_charset_mode != 0
-+	    && exit_alt_charset_mode != 0)
-+	    acs_chars = strdup(VT_ACSC);
-+    }
-+}
-+
-+static void
- sanity_check2(TERMTYPE *tp, bool literal)
- {
-     if (!PRESENT(exit_attribute_mode)) {
-@@ -428,10 +558,7 @@
-      * prefer to bypass it...
-      */
-     if (!literal) {
--	if (acs_chars == 0
--	    && enter_alt_charset_mode != 0
--	    && exit_alt_charset_mode != 0)
--	    acs_chars = strdup(VT_ACSC);
-+	fixup_acsc(tp, literal);
- 	ANDMISSING(enter_alt_charset_mode, acs_chars);
- 	ANDMISSING(exit_alt_charset_mode, acs_chars);
-     }
-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-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-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            *
-@@ -50,7 +50,7 @@
- #include <ctype.h>
- #include <tic.h>
- 
--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.100 2012/04/29 00:20:51 tom Exp $")
- 
- /*
-  * Maximum length of string capability we'll accept before raising an error.
-@@ -61,6 +61,7 @@
- #define iswhite(ch)	(ch == ' '  ||  ch == '\t')
- 
- NCURSES_EXPORT_VAR (int) _nc_syntax = 0;         /* termcap or terminfo? */
-+NCURSES_EXPORT_VAR (int) _nc_strict_bsd = 1;  /* ncurses extended termcap? */
- NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */
- 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 */
-@@ -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 @@
- }
- 
- static void
--push_back(char c)
-+push_back(int c)
- /* push a character back onto the input stream */
- {
-     if (bufptr == bufstart)
- 	_nc_syserr_abort("Can't backspace off beginning of line");
--    *--bufptr = c;
-+    *--bufptr = (char) c;
-     _nc_curr_col--;
- }
- 
-@@ -299,6 +306,8 @@
- 	*tok_ptr++ = (char) ch; \
- 	*tok_ptr = '\0'
- 
-+static char *tok_buf;
-+
- /*
-  *	int
-  *	get_token()
-@@ -336,15 +345,14 @@
- _nc_get_token(bool silent)
- {
-     static const char terminfo_punct[] = "@%&*!#";
--    static char *tok_buf;
- 
--    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)
- 		_nc_curr_token.tk_name = 0;
--	    FreeAndNull(tok_buf);
- 	}
- 	return (EOF);
-     }
-@@ -390,6 +397,7 @@
-     }
- 
-     ch = eat_escaped_newline(ch);
-+    _nc_curr_token.tk_valstring = 0;
- 
- #ifdef TRACE
-     old_line = _nc_curr_line;
-@@ -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)));
- 	    }
--	    if (c == '?') {
-+	    if (c == '?' && (_nc_syntax != SYN_TERMCAP)) {
- 		*(ptr++) = '\177';
- 		if (_nc_tracing)
- 		    _nc_warning("Allow ^? as synonym for \\177");
-@@ -758,23 +818,29 @@
- 		*(ptr++) = (char) (c);
- 	    }
- 	} else if (c == '\\') {
-+	    bool strict_bsd = ((_nc_syntax == SYN_TERMCAP) && _nc_strict_bsd);
-+
- 	    c = next_char();
- 	    if (c == EOF)
- 		_nc_err_abort(MSG_NO_INPUTS);
- 
--	    if (c >= '0' && c <= '7') {
-+#define isoctal(c) ((c) >= '0' && (c) <= '7')
-+
-+	    if (isoctal(c) || (strict_bsd && isdigit(c))) {
- 		number = c - '0';
- 		for (i = 0; i < 2; i++) {
- 		    c = next_char();
- 		    if (c == EOF)
- 			_nc_err_abort(MSG_NO_INPUTS);
- 
--		    if (c < '0' || c > '7') {
-+		    if (!isoctal(c)) {
- 			if (isdigit(c)) {
--			    _nc_warning("Non-octal digit `%c' in \\ sequence", c);
--			    /* allow the digit; it'll do less harm */
-+			    if (!strict_bsd) {
-+				_nc_warning("Non-octal digit `%c' in \\ sequence", c);
-+				/* allow the digit; it'll do less harm */
-+			    }
- 			} else {
--			    push_back((char) c);
-+			    push_back(c);
- 			    break;
- 			}
- 		    }
-@@ -782,21 +848,16 @@
- 		    number = number * 8 + c - '0';
- 		}
- 
--		if (number == 0)
-+		number = UChar(number);
-+		if (number == 0 && !strict_bsd)
- 		    number = 0200;
- 		*(ptr++) = (char) number;
- 	    } else {
- 		switch (c) {
- 		case 'E':
--		case 'e':
- 		    *(ptr++) = '\033';
- 		    break;
- 
--		case 'a':
--		    *(ptr++) = '\007';
--		    break;
--
--		case 'l':
- 		case 'n':
- 		    *(ptr++) = '\n';
- 		    break;
-@@ -809,10 +870,6 @@
- 		    *(ptr++) = '\010';
- 		    break;
- 
--		case 's':
--		    *(ptr++) = ' ';
--		    break;
--
- 		case 'f':
- 		    *(ptr++) = '\014';
- 		    break;
-@@ -833,16 +890,33 @@
- 		    *(ptr++) = ',';
- 		    break;
- 
--		case ':':
--		    *(ptr++) = ':';
--		    break;
--
- 		case '\n':
- 		    continue;
- 
- 		default:
--		    _nc_warning("Illegal character '%s' in \\ sequence",
--				unctrl(UChar(c)));
-+		    if ((_nc_syntax == SYN_TERMINFO) || !_nc_strict_bsd) {
-+			switch (c) {
-+			case 'a':
-+			    c = '\007';
-+			    break;
-+			case 'e':
-+			    c = '\033';
-+			    break;
-+			case 'l':
-+			    c = '\n';
-+			    break;
-+			case 's':
-+			    c = ' ';
-+			    break;
-+			case ':':
-+			    c = ':';
-+			    break;
-+			default:
-+			    _nc_warning("Illegal character '%s' in \\ sequence",
-+					unctrl(UChar(c)));
-+			    break;
-+			}
-+		    }
- 		    /* FALLTHRU */
- 		case '|':
- 		    *(ptr++) = (char) c;
-@@ -862,7 +936,7 @@
- 
- 	if (!ignored) {
- 	    if (_nc_curr_col <= 1) {
--		push_back((char) c);
-+		push_back(c);
- 		c = '\n';
- 		break;
- 	    }
-@@ -934,5 +1008,8 @@
-     if (pushname != 0) {
- 	FreeAndNull(pushname);
-     }
-+    if (tok_buf != 0) {
-+	FreeAndNull(tok_buf);
-+    }
- }
- #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-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 @@
- /****************************************************************************
-- * Copyright (c) 2006-2007,2010 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  *
-  * copy of this software and associated documentation files (the            *
-@@ -36,13 +36,142 @@
- 
- #include <curses.priv.h>
- 
-+#include <time.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: db_iterator.c,v 1.9 2010/12/25 23:00:25 tom Exp $")
-+#if USE_HASHED_DB
-+#include <hashed_db.h>
-+#endif
-+
-+MODULE_ID("$Id: db_iterator.c,v 1.34 2012/06/30 16:30:10 tom Exp $")
- 
- #define HaveTicDirectory _nc_globals.have_tic_directory
- #define KeepTicDirectory _nc_globals.keep_tic_directory
- #define TicDirectory     _nc_globals.tic_directory
-+#define my_blob          _nc_globals.dbd_blob
-+#define my_list          _nc_globals.dbd_list
-+#define my_size          _nc_globals.dbd_size
-+#define my_time          _nc_globals.dbd_time
-+#define my_vars          _nc_globals.dbd_vars
-+
-+static void
-+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;
-+	_nc_STRCPY(last, text, limit);
-+    }
-+}
-+
-+static bool
-+check_existence(const char *name, struct stat *sb)
-+{
-+    bool result = FALSE;
-+
-+    if (stat(name, sb) == 0
-+	&& (S_ISDIR(sb->st_mode) || S_ISREG(sb->st_mode))) {
-+	result = TRUE;
-+    }
-+#if USE_HASHED_DB
-+    else if (strlen(name) < PATH_MAX - sizeof(DBM_SUFFIX)) {
-+	char temp[PATH_MAX];
-+	_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", name, DBM_SUFFIX);
-+	if (stat(temp, sb) == 0 && S_ISREG(sb->st_mode)) {
-+	    result = TRUE;
-+	}
-+    }
-+#endif
-+    return result;
-+}
-+
-+/*
-+ * Store the latest value of an environment variable in my_vars[] so we can
-+ * detect if one changes, invalidating the cached search-list.
-+ */
-+static bool
-+update_getenv(const char *name, DBDIRS which)
-+{
-+    bool result = FALSE;
-+
-+    if (which < dbdLAST) {
-+	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;
-+	    my_vars[which].value = value;
-+	    result = TRUE;
-+	} else if ((my_vars[which].value != 0) ^ (value != 0)) {
-+	    FreeIfNeeded(my_vars[which].value);
-+	    my_vars[which].value = value;
-+	    result = TRUE;
-+	} else if (value != 0 && strcmp(value, my_vars[which].value)) {
-+	    FreeIfNeeded(my_vars[which].value);
-+	    my_vars[which].value = value;
-+	    result = TRUE;
-+	} else {
-+	    free(value);
-+	}
-+    }
-+    return result;
-+}
-+
-+static char *
-+cache_getenv(const char *name, DBDIRS which)
-+{
-+    char *result = 0;
-+
-+    (void) update_getenv(name, which);
-+    if (which < dbdLAST) {
-+	result = my_vars[which].value;
-+    }
-+    return result;
-+}
-+
-+/*
-+ * The cache expires if at least a second has passed since the initial lookup,
-+ * or if one of the environment variables changed.
-+ *
-+ * Only a few applications use multiple lookups of terminal entries, seems that
-+ * aside from bulk I/O such as tic and toe, that leaves interactive programs
-+ * which should not be modifying the terminal databases in a way that would
-+ * invalidate the search-list.
-+ *
-+ * The "1-second" is to allow for user-directed changes outside the program.
-+ */
-+static bool
-+cache_expired(void)
-+{
-+    bool result = FALSE;
-+    time_t now = time((time_t *) 0);
-+
-+    if (now > my_time) {
-+	result = TRUE;
-+    } else {
-+	DBDIRS n;
-+	for (n = (DBDIRS) 0; n < dbdLAST; ++n) {
-+	    if (my_vars[n].name != 0
-+		&& update_getenv(my_vars[n].name, n)) {
-+		result = TRUE;
-+		break;
-+	    }
-+	}
-+    }
-+    return result;
-+}
-+
-+static void
-+free_cache(void)
-+{
-+    FreeAndNull(my_blob);
-+    FreeAndNull(my_list);
-+}
- 
- /*
-  * Record the "official" location of the terminfo directory, according to
-@@ -51,6 +180,7 @@
- NCURSES_EXPORT(const char *)
- _nc_tic_dir(const char *path)
- {
-+    T(("_nc_tic_dir %s", NonNull(path)));
-     if (!KeepTicDirectory) {
- 	if (path != 0) {
- 	    TicDirectory = path;
-@@ -61,7 +191,7 @@
- 		return _nc_tic_dir(envp);
- 	}
-     }
--    return TicDirectory;
-+    return TicDirectory ? TicDirectory : TERMINFO;
- }
- 
- /*
-@@ -77,61 +207,16 @@
- }
- 
- /*
-- * Process the list of :-separated directories, looking for the terminal type.
-- * We don't use strtok because it does not show us empty tokens.
-- */
--#define ThisDbList	_nc_globals.dbi_list
--#define ThisDbSize	_nc_globals.dbi_size
--
--/*
-  * Cleanup.
-  */
- NCURSES_EXPORT(void)
- _nc_last_db(void)
- {
--    if (ThisDbList != 0) {
--	FreeAndNull(ThisDbList);
--    }
--    ThisDbSize = 0;
--}
--
--/* The TERMINFO_DIRS value, if defined by the configure script, begins with a
-- * ":", which will be interpreted as TERMINFO.
-- */
--static const char *
--next_list_item(const char *source, int *offset)
--{
--    if (source != 0) {
--	FreeIfNeeded(ThisDbList);
--	ThisDbList = strdup(source);
--	ThisDbSize = (int) strlen(source);
--    }
--
--    if (ThisDbList != 0 && ThisDbSize && *offset < ThisDbSize) {
--	static char system_db[] = TERMINFO;
--	char *result = ThisDbList + *offset;
--	char *marker = strchr(result, NCURSES_PATHSEP);
--
--	/*
--	 * Put a null on the marker if a separator was found.  Set the offset
--	 * to the next position after the marker so we can call this function
--	 * again, using the data at the offset.
--	 */
--	if (marker == 0) {
--	    *offset += (int) strlen(result);
--	} else {
--	    *marker++ = 0;
--	    *offset = (int) (marker - ThisDbList);
--	}
--	if (*result == 0 && result != (ThisDbList + ThisDbSize))
--	    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)
--
- /*
-  * 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 +226,186 @@
- _nc_next_db(DBDIRS * state, int *offset)
- {
-     const char *result;
--    char *envp;
--
--    while (*state < dbdLAST) {
--	DBDIRS next = (DBDIRS) ((int) (*state) + 1);
- 
-+    (void) offset;
-+    if ((int) *state < my_size
-+	&& my_list != 0
-+	&& my_list[*state] != 0) {
-+	result = my_list[*state];
-+	(*state)++;
-+    } else {
- 	result = 0;
-+    }
-+    if (result != 0) {
-+	T(("_nc_next_db %d %s", *state, result));
-+    }
-+    return result;
-+}
-+
-+NCURSES_EXPORT(void)
-+_nc_first_db(DBDIRS * state, int *offset)
-+{
-+    bool cache_has_expired = FALSE;
-+    *state = dbdTIC;
-+    *offset = 0;
-+
-+    T(("_nc_first_db"));
-+
-+    /* build a blob containing all of the strings we will use for a lookup
-+     * table.
-+     */
-+    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)
-+	    values[j] = 0;
-+
-+	/*
-+	 * This is the first item in the list, and is used only when tic is
-+	 * writing to the database, as a performance improvement.
-+	 */
-+	values[dbdTIC] = TicDirectory;
- 
--	switch (*state) {
--	case dbdTIC:
--	    if (HaveTicDirectory)
--		result = _nc_tic_dir(0);
--	    break;
- #if USE_DATABASE
--	case dbdEnvOnce:
--	    if (use_terminfo_vars()) {
--		if ((envp = getenv("TERMINFO")) != 0)
--		    result = _nc_tic_dir(envp);
--	    }
--	    break;
--	case dbdHome:
--	    if (use_terminfo_vars()) {
--		result = _nc_home_terminfo();
--	    }
--	    break;
--	case dbdEnvList:
--	    if (use_terminfo_vars()) {
--		if ((result = NEXT_DBD(getenv("TERMINFO_DIRS"), offset)) != 0)
--		    next = *state;
--	    }
--	    break;
--	case dbdCfgList:
- #ifdef TERMINFO_DIRS
--	    if ((result = NEXT_DBD(TERMINFO_DIRS, offset)) != 0)
--		next = *state;
-+	values[dbdCfgList] = TERMINFO_DIRS;
-+#endif
-+#ifdef TERMINFO
-+	values[dbdCfgOnce] = TERMINFO;
- #endif
--	    break;
--	case dbdCfgOnce:
--#ifndef TERMINFO_DIRS
--	    result = TERMINFO;
- #endif
--	    break;
--#endif /* USE_DATABASE */
-+
- #if USE_TERMCAP
--	case dbdEnvOnce2:
--	    if (use_terminfo_vars()) {
--		if ((envp = getenv("TERMCAP")) != 0)
--		    result = _nc_tic_dir(envp);
--	    }
--	    break;
--	case dbdEnvList2:
--	    if (use_terminfo_vars()) {
--		if ((result = NEXT_DBD(getenv("TERMPATH"), offset)) != 0)
--		    next = *state;
-+	values[dbdCfgList2] = TERMPATH;
-+#endif
-+
-+	if (use_terminfo_vars()) {
-+#if USE_DATABASE
-+	    values[dbdEnvOnce] = cache_getenv("TERMINFO", dbdEnvOnce);
-+	    values[dbdHome] = _nc_home_terminfo();
-+	    (void) cache_getenv("HOME", dbdHome);
-+	    values[dbdEnvList] = cache_getenv("TERMINFO_DIRS", dbdEnvList);
-+
-+#endif
-+#if USE_TERMCAP
-+	    values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
-+	    /* only use $TERMCAP if it is an absolute path */
-+	    if (values[dbdEnvOnce2] != 0
-+		&& *values[dbdEnvOnce2] != '/') {
-+		values[dbdEnvOnce2] = 0;
- 	    }
--	    break;
--	case dbdCfgList2:
--	    if ((result = NEXT_DBD(TERMPATH, offset)) != 0)
--		next = *state;
--	    break;
-+	    values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);
- #endif /* USE_TERMCAP */
--	case dbdLAST:
--	    break;
- 	}
--	if (*state != next) {
--	    *state = next;
--	    *offset = 0;
--	    _nc_last_db();
-+
-+	for (j = 0; j < dbdLAST; ++j) {
-+	    if (values[j] == 0)
-+		values[j] = "";
-+	    blobsize += 2 + strlen(values[j]);
- 	}
--	if (result != 0) {
--	    return result;
-+
-+	my_blob = malloc(blobsize);
-+	if (my_blob != 0) {
-+	    *my_blob = '\0';
-+	    for (j = 0; j < dbdLAST; ++j) {
-+		add_to_blob(values[j], blobsize);
-+	    }
-+
-+	    /* Now, build an array which will be pointers to the distinct
-+	     * strings in the blob.
-+	     */
-+	    blobsize = 2;
-+	    for (j = 0; my_blob[j] != '\0'; ++j) {
-+		if (my_blob[j] == NCURSES_PATHSEP)
-+		    ++blobsize;
-+	    }
-+	    my_list = typeCalloc(char *, blobsize);
-+	    my_stat = typeCalloc(struct stat, blobsize);
-+	    if (my_list != 0 && my_stat != 0) {
-+		k = 0;
-+		my_list[k++] = my_blob;
-+		for (j = 0; my_blob[j] != '\0'; ++j) {
-+		    if (my_blob[j] == NCURSES_PATHSEP) {
-+			my_blob[j] = '\0';
-+			my_list[k++] = &my_blob[j + 1];
-+		    }
-+		}
-+
-+		/*
-+		 * Eliminate duplicates from the list.
-+		 */
-+		for (j = 0; my_list[j] != 0; ++j) {
-+#ifdef TERMINFO
-+		    if (*my_list[j] == '\0')
-+			my_list[j] = strdup(TERMINFO);
-+#endif
-+		    for (k = 0; k < j; ++k) {
-+			if (!strcmp(my_list[j], my_list[k])) {
-+			    k = j - 1;
-+			    while ((my_list[j] = my_list[j + 1]) != 0) {
-+				++j;
-+			    }
-+			    j = k;
-+			    break;
-+			}
-+		    }
-+		}
-+
-+		/*
-+		 * Eliminate non-existent databases, and those that happen to
-+		 * be symlinked to another location.
-+		 */
-+		for (j = 0; my_list[j] != 0; ++j) {
-+		    bool found = check_existence(my_list[j], &my_stat[j]);
-+#if HAVE_LINK
-+		    if (found) {
-+			for (k = 0; k < j; ++k) {
-+			    if (my_stat[j].st_dev == my_stat[k].st_dev
-+				&& my_stat[j].st_ino == my_stat[k].st_ino) {
-+				found = FALSE;
-+				break;
-+			    }
-+			}
-+		    }
-+#endif
-+		    if (!found) {
-+			k = j;
-+			while ((my_list[k] = my_list[k + 1]) != 0) {
-+			    ++k;
-+			}
-+			--j;
-+		    }
-+		}
-+		my_size = j;
-+		my_time = time((time_t *) 0);
-+	    } else {
-+		FreeAndNull(my_blob);
-+	    }
-+	    free(my_stat);
- 	}
-     }
--    return 0;
- }
- 
--NCURSES_EXPORT(void)
--_nc_first_db(DBDIRS * state, int *offset)
-+#if NO_LEAKS
-+void
-+_nc_db_iterator_leaks(void)
- {
--    *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-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-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 <tic.h>
- 
--MODULE_ID("$Id: entries.c,v 1.17 2010/01/23 17:57:43 tom Exp $")
-+MODULE_ID("$Id: entries.c,v 1.21 2012/05/05 20:33:44 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -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);
-     _nc_first_name(0);
-+    _nc_db_iterator_leaks();
-     _nc_keyname_leaks();
- #if BROKEN_LINKER || USE_REENTRANT
-     _nc_names_leaks();
-     _nc_codes_leaks();
-     FreeIfNeeded(_nc_prescreen.real_acs_map);
- #endif
-+    _nc_comp_error_leaks();
- 
-     if ((s = _nc_home_terminfo()) != 0)
- 	free(s);
- 
- #ifdef TRACE
-     trace(0);
--    _nc_trace_buf(-1, 0);
-+    _nc_trace_buf(-1, (size_t) 0);
- #endif
- 
- #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-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 @@
- /****************************************************************************
-- * Copyright (c) 2006,2008 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2006-2008,2011 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,12 +36,79 @@
- 
- #if USE_HASHED_DB
- 
--MODULE_ID("$Id: hashed_db.c,v 1.14 2008/12/13 20:59:02 tom Exp $")
-+MODULE_ID("$Id: hashed_db.c,v 1.15 2011/08/13 21:08:08 tom Exp $")
- 
- #if HASHED_DB_API >= 2
- static DBC *cursor;
- #endif
- 
-+typedef struct _myconn {
-+    struct _myconn *next;
-+    DB *db;
-+    char *path;
-+    bool modify;
-+} MYCONN;
-+
-+static MYCONN *connections;
-+
-+static void
-+cleanup(void)
-+{
-+    while (connections != 0) {
-+	_nc_db_close(connections->db);
-+    }
-+}
-+
-+static DB *
-+find_connection(const char *path, bool modify)
-+{
-+    DB *result = 0;
-+    MYCONN *p;
-+
-+    for (p = connections; p != 0; p = p->next) {
-+	if (!strcmp(p->path, path) && p->modify == modify) {
-+	    result = p->db;
-+	    break;
-+	}
-+    }
-+
-+    return result;
-+}
-+
-+static void
-+drop_connection(DB * db)
-+{
-+    MYCONN *p, *q;
-+
-+    for (p = connections, q = 0; p != 0; q = p, p = p->next) {
-+	if (p->db == db) {
-+	    if (q != 0)
-+		q->next = p->next;
-+	    else
-+		connections = p->next;
-+	    free(p->path);
-+	    free(p);
-+	    break;
-+	}
-+    }
-+}
-+
-+static void
-+make_connection(DB * db, const char *path, bool modify)
-+{
-+    MYCONN *p = typeCalloc(MYCONN, 1);
-+
-+    if (p != 0) {
-+	p->db = db;
-+	p->path = strdup(path);
-+	p->modify = modify;
-+	if (p->path != 0) {
-+	    p->next = connections;
-+	    connections = p;
-+	}
-+    }
-+}
-+
- /*
-  * Open the database.
-  */
-@@ -51,50 +118,57 @@
-     DB *result = 0;
-     int code;
- 
-+    if (connections == 0)
-+	atexit(cleanup);
-+
-+    if ((result = find_connection(path, modify)) == 0) {
-+
- #if HASHED_DB_API >= 4
--    db_create(&result, NULL, 0);
--    if ((code = result->open(result,
--			     NULL,
--			     path,
--			     NULL,
--			     DB_HASH,
--			     modify ? DB_CREATE : DB_RDONLY,
--			     0644)) != 0) {
--	result = 0;
--    }
-+	db_create(&result, NULL, 0);
-+	if ((code = result->open(result,
-+				 NULL,
-+				 path,
-+				 NULL,
-+				 DB_HASH,
-+				 modify ? DB_CREATE : DB_RDONLY,
-+				 0644)) != 0) {
-+	    result = 0;
-+	}
- #elif HASHED_DB_API >= 3
--    db_create(&result, NULL, 0);
--    if ((code = result->open(result,
--			     path,
--			     NULL,
--			     DB_HASH,
--			     modify ? DB_CREATE : DB_RDONLY,
--			     0644)) != 0) {
--	result = 0;
--    }
-+	db_create(&result, NULL, 0);
-+	if ((code = result->open(result,
-+				 path,
-+				 NULL,
-+				 DB_HASH,
-+				 modify ? DB_CREATE : DB_RDONLY,
-+				 0644)) != 0) {
-+	    result = 0;
-+	}
- #elif HASHED_DB_API >= 2
--    if ((code = db_open(path,
--			DB_HASH,
--			modify ? DB_CREATE : DB_RDONLY,
--			0644,
--			(DB_ENV *) 0,
--			(DB_INFO *) 0,
--			&result)) != 0) {
--	result = 0;
--    }
-+	if ((code = db_open(path,
-+			    DB_HASH,
-+			    modify ? DB_CREATE : DB_RDONLY,
-+			    0644,
-+			    (DB_ENV *) 0,
-+			    (DB_INFO *) 0,
-+			    &result)) != 0) {
-+	    result = 0;
-+	}
- #else
--    if ((result = dbopen(path,
--			 modify ? (O_CREAT | O_RDWR) : O_RDONLY,
--			 0644,
--			 DB_HASH,
--			 NULL)) == 0) {
--	code = errno;
--    }
-+	if ((result = dbopen(path,
-+			     modify ? (O_CREAT | O_RDWR) : O_RDONLY,
-+			     0644,
-+			     DB_HASH,
-+			     NULL)) == 0) {
-+	    code = errno;
-+	}
- #endif
--    if (result != 0) {
--	T(("opened %s", path));
--    } else {
--	T(("cannot open %s: %s", path, strerror(code)));
-+	if (result != 0) {
-+	    make_connection(result, path, modify);
-+	    T(("opened %s", path));
-+	} else {
-+	    T(("cannot open %s: %s", path, strerror(code)));
-+	}
-     }
-     return result;
- }
-@@ -107,6 +181,7 @@
- {
-     int result;
- 
-+    drop_connection(db);
- #if HASHED_DB_API >= 2
-     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-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-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 <curses.priv.h>
- 
--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.64 2012/07/14 21:01:49 tom Exp $")
- 
- /*
-  * OS/2's native linker complains if we don't initialize public data when
-@@ -125,7 +125,7 @@
- 
-     FALSE,			/* have_tic_directory */
-     FALSE,			/* keep_tic_directory */
--    TERMINFO,			/* tic_directory */
-+    0,				/* tic_directory */
- 
-     NULL,			/* dbi_list */
-     0,				/* dbi_size */
-@@ -142,6 +142,12 @@
-     0,				/* tgetent_index */
-     0,				/* tgetent_sequence */
- 
-+    0,				/* dbd_blob */
-+    0,				/* dbd_list */
-+    0,				/* dbd_size */
-+    0,				/* dbd_time */
-+    { { 0, 0 } },		/* dbd_vars */
-+
- #ifndef USE_SP_WINDOWLIST
-     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-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-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,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.23 2012/06/30 22:08:24 tom Exp $")
- 
- NCURSES_EXPORT(int)
- NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
- {
--    (void) SP_PARM;
-     T((T_CALLED("napms(%d)"), ms));
- 
- #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;
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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            *
-@@ -46,7 +46,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_options.c,v 1.71 2009/10/24 21:56:15 tom Exp $")
-+MODULE_ID("$Id: lib_options.c,v 1.72 2011/10/22 16:31:35 tom Exp $")
- 
- NCURSES_EXPORT(int)
- idlok(WINDOW *win, bool flag)
-@@ -324,7 +324,7 @@
-  * the terminal state _before_ switching modes.
-  */
- NCURSES_EXPORT(int)
--_nc_keypad(SCREEN *sp, bool flag)
-+_nc_keypad(SCREEN *sp, int flag)
- {
-     int rc = ERR;
- 
-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-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-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,7 +39,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--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.23 2012/02/22 22:34:31 tom Exp $")
- 
- NCURSES_EXPORT(int)
- NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
-@@ -76,10 +76,10 @@
- 	return (ERR);
-     }
- 
--    (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);
-+	_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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -49,11 +49,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_raw.c,v 1.19 2010/04/24 23:49:12 tom Exp $")
--
--#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
--#define _POSIX_SOURCE
--#endif
-+MODULE_ID("$Id: lib_raw.c,v 1.21 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
- 
- #if HAVE_SYS_TERMIO_H
- #include <sys/termio.h>		/* needed for ISC */
-@@ -66,6 +62,11 @@
- #define _nc_setmode(mode)	/* nothing */
- #endif
- 
-+#if USE_KLIBC_KBD
-+#define INCL_KBD
-+#include <os2.h>
-+#endif
-+
- #define COOKED_INPUT	(IXON|BRKINT|PARMRK)
- 
- #ifdef TRACE
-@@ -100,6 +101,17 @@
- #endif
- 	result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
- 	if (result == OK) {
-+#if USE_KLIBC_KBD
-+	    KBDINFO kbdinfo;
-+
-+	    kbdinfo.cb = sizeof(kbdinfo);
-+	    KbdGetStatus(&kbdinfo, 0);
-+
-+	    kbdinfo.cb = sizeof(kbdinfo);
-+	    kbdinfo.fsMask &= ~KEYBOARD_ASCII_MODE;
-+	    kbdinfo.fsMask |= KEYBOARD_BINARY_MODE;
-+	    KbdSetStatus(&kbdinfo, 0);
-+#endif
- 	    SP_PARM->_raw = TRUE;
- 	    SP_PARM->_cbreak = 1;
- 	    termp->Nttyb = buf;
-@@ -218,6 +230,17 @@
- #endif
- 	result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
- 	if (result == OK) {
-+#if USE_KLIBC_KBD
-+	    KBDINFO kbdinfo;
-+
-+	    kbdinfo.cb = sizeof(kbdinfo);
-+	    KbdGetStatus(&kbdinfo, 0);
-+
-+	    kbdinfo.cb = sizeof(kbdinfo);
-+	    kbdinfo.fsMask &= ~KEYBOARD_BINARY_MODE;
-+	    kbdinfo.fsMask |= KEYBOARD_ASCII_MODE;
-+	    KbdSetStatus(&kbdinfo, 0);
-+#endif
- 	    SP_PARM->_raw = FALSE;
- 	    SP_PARM->_cbreak = 0;
- 	    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-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 */
- 
--#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
--#define _POSIX_SOURCE
--#endif
--
- #if HAVE_LOCALE_H
- #include <locale.h>
- #endif
- 
--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.148 2012/07/21 18:05:41 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -225,6 +222,7 @@
- {
-     T((T_CALLED("use_env(%p,%d)"), (void *) SP_PARM, (int) f));
- #if NCURSES_SP_FUNCS
-+    START_TRACE();
-     if (IsPreScreen(SP_PARM)) {
- 	SP_PARM->_use_env = f;
-     }
-@@ -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)
- {
-     T((T_CALLED("use_env(%d)"), (int) f));
-+    START_TRACE();
-     _nc_prescreen.use_env = f;
-     returnVoid;
- }
-+
-+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 @@
-  *
-  ****************************************************************************/
- 
--#define ret_error(code, fmt, arg)	if (errret) {\
--					    *errret = code;\
--					    returnCode(ERR);\
--					} else {\
--					    fprintf(stderr, fmt, arg);\
--					    exit(EXIT_FAILURE);\
--					}
--
--#define ret_error0(code, msg)		if (errret) {\
--					    *errret = code;\
--					    returnCode(ERR);\
--					} else {\
--					    fprintf(stderr, msg);\
--					    exit(EXIT_FAILURE);\
--					}
--
- #if USE_DATABASE || USE_TERMCAP
- /*
-  * Return 1 if entry found, 0 if not found, -1 if database not accessible,
-@@ -467,7 +493,7 @@
- **	and substitute it in for the prototype given in 'command_character'.
- */
- void
--_nc_tinfo_cmdch(TERMINAL * termp, char proto)
-+_nc_tinfo_cmdch(TERMINAL * termp, int proto)
- {
-     unsigned i;
-     char CC;
-@@ -481,8 +507,8 @@
-     if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
- 	CC = *tmp;
- 	for_each_string(i, &(termp->type)) {
--	    for (tmp = termp->type.Strings[i]; *tmp; tmp++) {
--		if (*tmp == proto)
-+	    for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) {
-+		if (UChar(*tmp) == proto)
- 		    *tmp = CC;
- 	    }
- 	}
-@@ -551,7 +577,7 @@
-     int value;
-     int result = 0;
- 
--    if ((env = getenv(env_name)) != 0) {
-+    if (getenv(env_name) != 0) {
- 	result = _nc_getenv_num(env_name);
-     } else if ((value = tigetnum("U8")) >= 0) {
- 	result = value;		/* use extension feature */
-@@ -578,7 +604,7 @@
- 		 NCURSES_CONST char *tname,
- 		 int Filedes,
- 		 int *errret,
--		 bool reuse)
-+		 int reuse)
- {
- #ifdef USE_TERM_DRIVER
-     TERMINAL_CONTROL_BLOCK *TCB = 0;
-@@ -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");
- 	    } else if (status == TGETENT_NO) {
--		ret_error(status, "'%s': unknown terminal type.\n", tname);
-+		ret_error1(status, "unknown terminal type.\n", tname);
- 	    }
- 	}
- #if !USE_REENTRANT
--	strncpy(ttytype, termp->type.term_names, NAMESIZE - 1);
-+	strncpy(ttytype, termp->type.term_names, (size_t) (NAMESIZE - 1));
- 	ttytype[NAMESIZE - 1] = '\0';
- #endif
- 
-@@ -708,7 +734,7 @@
- 	set_curterm(termp);
- 
- 	if (command_character)
--	    _nc_tinfo_cmdch(termp, *command_character);
-+	    _nc_tinfo_cmdch(termp, UChar(*command_character));
- 
- 	/*
- 	 * If an application calls setupterm() rather than initscr() or
-@@ -742,10 +768,19 @@
- 
- #ifndef USE_TERM_DRIVER
-     if (generic_type) {
--	ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
--    }
--    if (hard_copy) {
--	ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname);
-+	/*
-+	 * BSD 4.3's termcap contains mis-typed "gn" for wy99.  Do a sanity
-+	 * check before giving up.
-+	 */
-+	if ((VALID_STRING(cursor_address)
-+	     || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
-+	    && VALID_STRING(clear_screen)) {
-+	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
-+	} else {
-+	    ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
-+	}
-+    } else if (hard_copy) {
-+	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
-     }
- #endif
-     returnCode(code);
-@@ -798,7 +833,7 @@
- _nc_setupterm(NCURSES_CONST char *tname,
- 	      int Filedes,
- 	      int *errret,
--	      bool reuse)
-+	      int reuse)
- {
-     int res;
-     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-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-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            *
-@@ -48,7 +48,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--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.78 2012/02/22 22:34:31 tom Exp $")
- 
- NCURSES_EXPORT_VAR(char *) UP = 0;
- NCURSES_EXPORT_VAR(char *) BC = 0;
-@@ -97,7 +97,7 @@
- #ifdef USE_TERM_DRIVER
-     if (termp == 0 ||
- 	!((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)
--	return (rc);
-+	returnCode(rc);
- #endif
- 
-     /*
-@@ -203,10 +203,11 @@
- same_tcname(const char *a, const char *b)
- {
-     fprintf(stderr, "compare(%s,%s)\n", a, b);
--    return !strncmp(a, b, 2);
-+    return !strncmp(a, b, (size_t) 2);
- }
-+
- #else
--#define same_tcname(a,b) !strncmp(a,b,2)
-+#define same_tcname(a,b) !strncmp(a, b, (size_t) 2)
- #endif
- 
- /***************************************************************************
-@@ -351,7 +352,7 @@
- #endif
- 	if (j >= 0) {
- 	    result = tp->Strings[j];
--	    TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result)));
-+	    TR(TRACE_DATABASE, ("found match %d: %s", j, _nc_visbuf(result)));
- 	    /* setupterm forces canceled strings to null */
- 	    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-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>
- #include <tic.h>
- 
--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.86 2012/02/22 22:40:24 tom Exp $")
- 
- /*
-  *	char *
-@@ -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 */
- 
--    get_space((unsigned) len + 1);
-+    get_space((size_t) len + 1);
- 
--    (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 +168,7 @@
- {
-     if (c == 0)
- 	c = 0200;
--    get_space(1);
-+    get_space((size_t) 1);
-     TPS(out_buff)[TPS(out_used)++] = (char) c;
- }
- 
-@@ -450,7 +454,7 @@
- }
- 
- static NCURSES_INLINE char *
--tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
-+tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
- {
-     char *p_is_s[NUM_PARM];
-     TPARM_ARG param[NUM_PARM];
-@@ -522,7 +526,7 @@
-     }
- #ifdef TRACE
-     if (USE_TRACEF(TRACE_CALLS)) {
--	for (i = 0; i < popcount; i++) {
-+	for (i = 0; i < num_args; i++) {
- 	    if (p_is_s[i] != 0)
- 		save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
- 	    else
-@@ -757,7 +761,7 @@
- 	cp++;
-     }				/* endwhile (*cp) */
- 
--    get_space(1);
-+    get_space((size_t) 1);
-     TPS(out_buff)[TPS(out_used)] = '\0';
- 
-     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-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-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,7 +51,7 @@
- #include <termcap.h>		/* ospeed */
- #include <tic.h>
- 
--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.84 2012/02/22 22:40:24 tom Exp $")
- 
- NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
- NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
-@@ -145,7 +145,7 @@
- 	 * POSIX says write() is safe in a signal handler, but the
- 	 * buffered I/O is not.
- 	 */
--	if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1) == -1)
-+	if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, (size_t) 1) == -1)
- 	    rc = ERR;
-     } 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-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 @@
- /****************************************************************************
-- * 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 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_ttyflags.c,v 1.27 2010/12/25 23:43:58 tom Exp $")
-+MODULE_ID("$Id: lib_ttyflags.c,v 1.28 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
- 
- NCURSES_EXPORT(int)
- NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
-@@ -105,7 +105,11 @@
- 	    result = CallDriver_2(SP_PARM, sgmode, TRUE, buf);
- #else
- 	    for (;;) {
--		if (SET_TTY(termp->Filedes, buf) != 0) {
-+		if ((SET_TTY(termp->Filedes, buf) != 0)
-+#if USE_KLIBC_KBD
-+		    && !isatty(termp->Filedes)
-+#endif
-+		    ) {
- 		    if (errno == EINTR)
- 			continue;
- 		    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-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-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            *
-@@ -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.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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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 @@
- #define USE_TERMLIB 1
- #include <build.priv.h>
- 
--MODULE_ID("$Id: make_keys.c,v 1.19 2010/06/05 22:08:00 tom Exp $")
-+MODULE_ID("$Id: make_keys.c,v 1.20 2011/10/22 16:34:50 tom Exp $")
- 
- #include <names.c>
- 
-@@ -76,7 +76,7 @@
-     unsigned maxlen = 16;
-     int scanned;
- 
--    while (fgets(buffer, sizeof(buffer), ifp) != 0) {
-+    while (fgets(buffer, (int) sizeof(buffer), ifp) != 0) {
- 	if (*buffer == '#')
- 	    continue;
- 
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2008,2011 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,18 +33,30 @@
- #include <curses.priv.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $")
-+MODULE_ID("$Id: name_match.c,v 1.21 2011/08/13 20:23:12 tom Exp $")
- 
--/*
-- *	_nc_first_name(char *names)
-- *
-- *	Extract the primary name from a compiled entry.
-- */
- #define FirstName _nc_globals.first_name
- 
-+#if USE_TERMCAP && NCURSES_XNAMES
-+static const char *
-+skip_index(const char *name)
-+{
-+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
-+	const char *bar = strchr(name, '|');
-+	if (bar != 0 && (bar - name) == 2)
-+	    name = bar + 1;
-+    }
-+    return name;
-+}
-+#endif
-+
-+/*
-+ * Get the primary name from the given name list.  For terminfo, this is the
-+ * first name.  For termcap, this may be the second name, if the first one
-+ * happens to be two characters.
-+ */
- NCURSES_EXPORT(char *)
- _nc_first_name(const char *const sp)
--/* get the first name from the given name list */
- {
-     unsigned n;
- 
-@@ -59,8 +71,12 @@
- 	    FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
- 
- 	if (FirstName != 0) {
-+	    const char *src = sp;
-+#if USE_TERMCAP && NCURSES_XNAMES
-+	    src = skip_index(sp);
-+#endif
- 	    for (n = 0; n < MAX_NAME_SIZE; n++) {
--		if ((FirstName[n] = sp[n]) == '\0'
-+		if ((FirstName[n] = src[n]) == '\0'
- 		    || (FirstName[n] == '|'))
- 		    break;
- 	    }
-@@ -71,11 +87,8 @@
- }
- 
- /*
-- *	int _nc_name_match(namelist, name, delim)
-- *
-- *	Is the given name matched in namelist?
-+ * Is the given name matched in namelist?
-  */
--
- NCURSES_EXPORT(int)
- _nc_name_match(const char *const namelst, const char *const name, const char *const delim)
- {
-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-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-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            *
-@@ -47,7 +47,7 @@
- #include <ctype.h>
- #include <tic.h>
- 
--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.78 2012/02/22 22:40:24 tom Exp $")
- 
- #ifdef LINT
- static short const parametrized[] =
-@@ -203,6 +203,8 @@
-  	{ bad_tc_usage = TRUE; \
- 	 _nc_warning("Legacy termcap allows only a trailing tc= clause"); }
- 
-+#define MAX_NUMBER 0x7fff	/* positive shorts only */
-+
- NCURSES_EXPORT(int)
- _nc_parse_entry(struct entry *entryp, int literal, bool silent)
- {
-@@ -444,8 +446,12 @@
- 		break;
- 
- 	    case NUMBER:
--		entryp->tterm.Numbers[entry_ptr->nte_index] =
--		    (short) _nc_curr_token.tk_valnumber;
-+		if (_nc_curr_token.tk_valnumber > MAX_NUMBER) {
-+		    entryp->tterm.Numbers[entry_ptr->nte_index] = MAX_NUMBER;
-+		} else {
-+		    entryp->tterm.Numbers[entry_ptr->nte_index] =
-+			(short) _nc_curr_token.tk_valnumber;
-+		}
- 		break;
- 
- 	    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-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 @@
- 
- #include <tic.h>
- 
--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.119 2012/02/22 22:40:24 tom Exp $")
- 
- #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
- 
-@@ -99,7 +99,7 @@
-     if (have > 0) {
- 	if ((int) want > have)
- 	    want = (unsigned) have;
--	memcpy(dst, src + *offset, want);
-+	memcpy(dst, src + *offset, (size_t) want);
- 	*offset += (int) want;
-     } else {
- 	want = 0;
-@@ -107,17 +107,19 @@
-     return (int) want;
- }
- 
--#define Read(buf, count) fake_read(buffer, &offset, limit, buf, count)
-+#define Read(buf, count) fake_read(buffer, &offset, limit, buf, (unsigned) count)
- 
- #define read_shorts(buf, count) \
--	(Read(buf, (unsigned) (count)*2) == (int) (count)*2)
-+	(Read(buf, (count)*2) == (int) (count)*2)
- 
- #define even_boundary(value) \
-     if ((value) % 2 != 0) Read(buf, 1)
- 
-+/*
-+ * Return TGETENT_YES if read, TGETENT_NO if not found or garbled.
-+ */
- NCURSES_EXPORT(int)
- _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit)
--/* return 1 if read, 0 if not found or garbled */
- {
-     int offset = 0;
-     int name_size, bool_count, num_count, str_count, str_size;
-@@ -173,7 +175,7 @@
-     ptr->str_table = string_table;
-     ptr->term_names = string_table;
-     if ((have = (unsigned) Read(ptr->term_names, want)) != want) {
--	memset(ptr->term_names + have, 0, want - have);
-+	memset(ptr->term_names + have, 0, (size_t) (want - have));
-     }
-     ptr->term_names[want] = '\0';
-     string_table += (want + 1);
-@@ -326,17 +328,18 @@
- 			    ext_str_limit, ptr->ext_str_table + base);
- 	}
- 
--	T(("...done reading terminfo bool %d(%d) num %d(%d) str %d(%d)",
--	   ptr->num_Booleans, ptr->ext_Booleans,
--	   ptr->num_Numbers, ptr->ext_Numbers,
--	   ptr->num_Strings, ptr->ext_Strings));
-+	TR(TRACE_DATABASE,
-+	   ("...done reading terminfo bool %d(%d) num %d(%d) str %d(%d)",
-+	    ptr->num_Booleans, ptr->ext_Booleans,
-+	    ptr->num_Numbers, ptr->ext_Numbers,
-+	    ptr->num_Strings, ptr->ext_Strings));
- 
- 	TR(TRACE_DATABASE, ("extend: num_Booleans:%d", ptr->num_Booleans));
-     } else
- #endif /* NCURSES_XNAMES */
-     {
--	T(("...done reading terminfo bool %d num %d str %d",
--	   bool_count, num_count, str_count));
-+	TR(TRACE_DATABASE, ("...done reading terminfo bool %d num %d str %d",
-+			    bool_count, num_count, str_count));
- #if NCURSES_XNAMES
- 	TR(TRACE_DATABASE, ("normal: num_Booleans:%d", ptr->num_Booleans));
- #endif
-@@ -371,13 +374,13 @@
- 
-     if (_nc_access(filename, R_OK) < 0
- 	|| (fp = fopen(filename, "rb")) == 0) {
--	T(("cannot open terminfo %s (errno=%d)", filename, errno));
-+	TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
- 	code = TGETENT_NO;
-     } else {
- 	if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp))
- 	    > 0) {
- 
--	    T(("read terminfo %s", filename));
-+	    TR(TRACE_DATABASE, ("read terminfo %s", filename));
- 	    if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) {
- 		_nc_free_termtype(ptr);
- 	    }
-@@ -390,6 +393,58 @@
-     return (code);
- }
- 
-+#if USE_HASHED_DB
-+/*
-+ * Return if if we can build the filename of a ".db" file.
-+ */
-+static bool
-+make_db_filename(char *filename, unsigned limit, const char *const path)
-+{
-+    static const char suffix[] = DBM_SUFFIX;
-+
-+    unsigned lens = sizeof(suffix) - 1;
-+    unsigned size = strlen(path);
-+    unsigned test = lens + size;
-+    bool result = FALSE;
-+
-+    if (test < limit) {
-+	if (size >= lens
-+	    && !strcmp(path + size - lens, suffix))
-+	    _nc_STRCPY(filename, path, limit);
-+	else
-+	    _nc_SPRINTF(filename, _nc_SLIMIT(limit) "%s%s", path, suffix);
-+	result = TRUE;
-+    }
-+    return result;
-+}
-+#endif
-+
-+/*
-+ * Return true if we can build the name of a filesystem entry.
-+ */
-+static bool
-+make_dir_filename(char *filename,
-+		  unsigned limit,
-+		  const char *const path,
-+		  const char *name)
-+{
-+    bool result = FALSE;
-+
-+#if USE_TERMCAP
-+    if (_nc_is_dir_path(path))
-+#endif
-+    {
-+	unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name));
-+
-+	if (need <= limit) {
-+	    _nc_SPRINTF(filename, _nc_SLIMIT(limit)
-+			"%s/" LEAF_FMT "/%s", path, *name, name);
-+	    result = TRUE;
-+	}
-+    }
-+    return result;
-+}
-+
- /*
-  * Build a terminfo pathname and try to read the data.  Returns TGETENT_YES on
-  * success, TGETENT_NO on failure.
-@@ -401,101 +456,80 @@
- 		   const char *name,
- 		   TERMTYPE *const tp)
- {
--    int result = TGETENT_NO;
--
--    /*
--     * If we are looking in a directory, assume the entry is a file under that,
--     * according to the normal rules.
--     */
--    unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name));
--    if (need <= limit)
--	(void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
-+    int code = TGETENT_NO;
- 
--    if (_nc_is_dir_path(path))
--	result = _nc_read_file_entry(filename, tp);
- #if USE_HASHED_DB
--    else {
--	static const char suffix[] = DBM_SUFFIX;
--	DB *capdbp;
--	unsigned lens = sizeof(suffix) - 1;
--	unsigned size = strlen(path);
--	unsigned test = lens + size;
--
--	if (test < limit) {
--	    if (size >= lens
--		&& !strcmp(path + size - lens, suffix))
--		(void) strcpy(filename, path);
--	    else
--		(void) sprintf(filename, "%s%s", path, suffix);
-+    DB *capdbp;
- 
--	    /*
--	     * It would be nice to optimize the dbopen/close activity, as
--	     * done in the cgetent implementation for tc= clauses.  However,
--	     * since we support multiple database locations, we cannot do
--	     * that.
--	     */
--	    if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
--		DBT key, data;
--		int reccnt = 0;
--		char *save = strdup(name);
--
--		memset(&key, 0, sizeof(key));
--		key.data = save;
--		key.size = strlen(save);
--
--		/*
--		 * This lookup could return termcap data, which we do not want. 
--		 * We are looking for compiled (binary) terminfo data.
--		 *
--		 * cgetent uses a two-level lookup.  On the first it uses the
--		 * given name to return a record containing only the aliases
--		 * for an entry.  On the second (using that list of aliases as
--		 * a key), it returns the content of the terminal description. 
--		 * We expect second lookup to return data beginning with the
--		 * same set of aliases.
--		 *
--		 * For compiled terminfo, the list of aliases in the second
--		 * case will be null-terminated.  A termcap entry will not be,
--		 * and will run on into the description.  So we can easily
--		 * distinguish between the two (source/binary) by checking the
--		 * lengths.
--		 */
--		while (_nc_db_get(capdbp, &key, &data) == 0) {
--		    int used = data.size - 1;
--		    char *have = (char *) data.data;
--
--		    if (*have++ == 0) {
--			if (data.size > key.size
--			    && IS_TIC_MAGIC(have)) {
--			    result = _nc_read_termtype(tp, have, used);
--			    if (result == TGETENT_NO) {
--				_nc_free_termtype(tp);
--			    }
--			}
--			break;
--		    }
-+    if (make_db_filename(filename, limit, path)
-+	&& (capdbp = _nc_db_open(filename, FALSE)) != 0) {
- 
--		    /*
--		     * Just in case we have a corrupt database, do not waste
--		     * time with it.
--		     */
--		    if (++reccnt >= 3)
--			break;
--
--		    /*
--		     * Prepare for the second level.
--		     */
--		    key.data = have;
--		    key.size = used;
-+	DBT key, data;
-+	int reccnt = 0;
-+	char *save = strdup(name);
-+
-+	memset(&key, 0, sizeof(key));
-+	key.data = save;
-+	key.size = strlen(save);
-+
-+	/*
-+	 * This lookup could return termcap data, which we do not want.  We are
-+	 * looking for compiled (binary) terminfo data.
-+	 *
-+	 * cgetent uses a two-level lookup.  On the first it uses the given
-+	 * name to return a record containing only the aliases for an entry. 
-+	 * On the second (using that list of aliases as a key), it returns the
-+	 * content of the terminal description.  We expect second lookup to
-+	 * return data beginning with the same set of aliases.
-+	 *
-+	 * For compiled terminfo, the list of aliases in the second case will
-+	 * be null-terminated.  A termcap entry will not be, and will run on
-+	 * into the description.  So we can easily distinguish between the two
-+	 * (source/binary) by checking the lengths.
-+	 */
-+	while (_nc_db_get(capdbp, &key, &data) == 0) {
-+	    int used = data.size - 1;
-+	    char *have = (char *) data.data;
-+
-+	    if (*have++ == 0) {
-+		if (data.size > key.size
-+		    && IS_TIC_MAGIC(have)) {
-+		    code = _nc_read_termtype(tp, have, used);
-+		    if (code == TGETENT_NO) {
-+			_nc_free_termtype(tp);
-+		    }
- 		}
--
--		_nc_db_close(capdbp);
--		free(save);
-+		break;
- 	    }
-+
-+	    /*
-+	     * Just in case we have a corrupt database, do not waste time with
-+	     * it.
-+	     */
-+	    if (++reccnt >= 3)
-+		break;
-+
-+	    /*
-+	     * Prepare for the second level.
-+	     */
-+	    key.data = have;
-+	    key.size = used;
- 	}
-+
-+	free(save);
-+    } else			/* may be either filesystem or flat file */
-+#endif
-+    if (make_dir_filename(filename, limit, path, name)) {
-+	code = _nc_read_file_entry(filename, tp);
-+    }
-+#if USE_TERMCAP
-+    else if (code != TGETENT_YES) {
-+	code = _nc_read_termcap_entry(name, tp);
-+	_nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
-+		    "%.*s", PATH_MAX - 1, _nc_get_source());
-     }
- #endif
--    return result;
-+    return code;
- }
- #endif /* USE_DATABASE */
- 
-@@ -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
- 	|| strchr(name, NCURSES_PATHSEP) != 0) {
--	T(("illegal or missing entry name '%s'", name));
-+	TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name));
-     } else {
- #if USE_DATABASE
--	DBDIRS state = dbdTIC;
--	int offset = 0;
-+	DBDIRS state;
-+	int offset;
- 	const char *path;
- 
-+	_nc_first_db(&state, &offset);
- 	while ((path = _nc_next_db(&state, &offset)) != 0) {
-+	    TR(TRACE_DATABASE, ("_nc_read_tic_entry path=%s, name=%s", path, name));
- 	    code = _nc_read_tic_entry(filename, PATH_MAX, path, name, tp);
- 	    if (code == TGETENT_YES) {
- 		_nc_last_db();
- 		break;
- 	    }
- 	}
--#endif
--#if USE_TERMCAP
-+#elif USE_TERMCAP
- 	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
-     }
-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-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-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            *
-@@ -54,10 +54,9 @@
- 
- #include <ctype.h>
- #include <sys/types.h>
--#include <sys/stat.h>
- #include <tic.h>
- 
--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.87 2012/05/05 19:40:50 tom Exp $")
- 
- #if !PURE_TERMINFO
- 
-@@ -74,7 +73,7 @@
- 
-     if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == 0)
- 	result = TERMPATH;
--    T(("TERMPATH is %s", result));
-+    TR(TRACE_DATABASE, ("TERMPATH is %s", result));
-     return result;
- }
- 
-@@ -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++;
- 			if (c == '\n') {
- 			    lineno++;
--			    if (rp == record || *(rp - 1) != '\\')
-+			    /*
-+			     * Unlike BSD 4.3, this ignores a backslash at the
-+			     * end of a comment-line.  That makes it consistent
-+			     * with the rest of ncurses -TD
-+			     */
-+			    if (rp == record
-+				|| *record == '#'
-+				|| *(rp - 1) != '\\')
- 				break;
- 			}
- 			*rp++ = c;
-@@ -442,8 +448,10 @@
- 		break;
- 	}
- 
--	if (!foundit)
-+	if (!foundit) {
-+	    free(record);
- 	    return (TC_NOT_FOUND);
-+	}
-     }
- 
-     /*
-@@ -455,7 +463,7 @@
- 	register int newilen;
- 	unsigned ilen;
- 	int diff, iret, tclen, oline;
--	char *icap, *scan, *tc, *tcstart, *tcend;
-+	char *icap = 0, *scan, *tc, *tcstart, *tcend;
- 
- 	/*
- 	 * Loop invariants:
-@@ -468,8 +476,9 @@
- 	scan = record;
- 	tc_not_resolved = FALSE;
- 	for (;;) {
--	    if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0)
-+	    if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0) {
- 		break;
-+	    }
- 
- 	    /*
- 	     * Find end of tc=name and stomp on the trailing `:'
-@@ -486,6 +495,7 @@
- 	    tclen = s - tcstart;
- 	    tcend = s;
- 
-+	    icap = 0;
- 	    iret = _nc_getent(&icap, &ilen, &oline, current, db_array, fd,
- 			      tc, depth + 1, 0);
- 	    newicap = icap;	/* Put into a register. */
-@@ -496,12 +506,13 @@
- 		    if (myfd)
- 			(void) close(fd);
- 		    free(record);
-+		    FreeIfNeeded(icap);
- 		    return (iret);
- 		}
--		if (iret == TC_UNRESOLVED)
-+		if (iret == TC_UNRESOLVED) {
- 		    tc_not_resolved = TRUE;
--		/* couldn't resolve tc */
--		if (iret == TC_NOT_FOUND) {
-+		    /* couldn't resolve tc */
-+		} else if (iret == TC_NOT_FOUND) {
- 		    *(s - 1) = ':';
- 		    scan = s - 1;
- 		    tc_not_resolved = TRUE;
-@@ -581,8 +592,9 @@
-     }
- 
-     *cap = record;
--    if (tc_not_resolved)
-+    if (tc_not_resolved) {
- 	return (TC_UNRESOLVED);
-+    }
-     return (current);
- }
- 
-@@ -697,8 +709,6 @@
- #define	PVECSIZ		32	/* max number of names in path */
- #define TBUFSIZ (2048*2)
- 
--static char *tbuf;
--
- /*
-  * On entry, srcp points to a non ':' character which is the beginning of the
-  * token, if any.  We'll try to return a string that doesn't end with a ':'.
-@@ -776,18 +786,18 @@
-     register char *p;
-     register char *cp;
-     char *dummy = NULL;
--    char **fname;
-+    CGETENT_CONST char **fname;
-     char *home;
-     int i;
-     char pathbuf[PBUFSIZ];	/* holds raw path of filenames */
--    char *pathvec[PVECSIZ];	/* to point to names in pathbuf */
--    char **pvec;		/* holds usable tail of path vector */
-+    CGETENT_CONST char *pathvec[PVECSIZ];	/* point to names in pathbuf */
-+    CGETENT_CONST char **pvec;	/* holds usable tail of path vector */
-     NCURSES_CONST char *termpath;
-     string_desc desc;
- 
-+    *lineno = 1;
-     fname = pathvec;
-     pvec = pathvec;
--    tbuf = bp;
-     p = pathbuf;
-     cp = use_terminfo_vars()? getenv("TERMCAP") : NULL;
- 
-@@ -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 @@
- 	}
-     }
-     *fname = 0;			/* mark end of vector */
-+#if !HAVE_BSD_CGETENT
-+    (void) _nc_cgetset(0);
-+#endif
-     if (_nc_is_abs_path(cp)) {
- 	if (_nc_cgetset(cp) < 0) {
- 	    return (TC_SYS_ERR);
-@@ -853,6 +867,7 @@
-      * empty fields, and mistakenly use the last valid cap entry instead of
-      * the first (breaks tc= includes)
-      */
-+    *bp = '\0';
-     if (i >= 0) {
- 	char *pd, *ps, *tok;
- 	int endflag = FALSE;
-@@ -932,7 +947,7 @@
-     if (count < MAXPATHS
- 	&& _nc_access(path, R_OK) == 0) {
- 	termpaths[count++] = path;
--	T(("Adding termpath %s", path));
-+	TR(TRACE_DATABASE, ("Adding termpath %s", path));
-     }
-     termpaths[count] = 0;
-     if (save != 0)
-@@ -956,13 +971,13 @@
-     static char *source;
-     static int lineno;
- 
--    T(("read termcap entry for %s", tn));
-+    TR(TRACE_DATABASE, ("read termcap entry for %s", tn));
- 
-     if (strlen(tn) == 0
- 	|| strcmp(tn, ".") == 0
- 	|| strcmp(tn, "..") == 0
- 	|| _nc_pathlast(tn) != 0) {
--	T(("illegal or missing entry name '%s'", tn));
-+	TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", tn));
- 	return TGETENT_NO;
-     }
- 
-@@ -980,7 +995,7 @@
- 	_nc_curr_line = lineno;
- 	_nc_set_source(source);
-     }
--    _nc_read_entry_source((FILE *) 0, tc, FALSE, FALSE, NULLHOOK);
-+    _nc_read_entry_source((FILE *) 0, tc, FALSE, TRUE, NULLHOOK);
- #else
-     /*
-      * Here is what the 4.4BSD termcap(3) page prescribes:
-@@ -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;
- 	if (stat(termpaths[j], &test_stat[j]) != 0
--	    || (test_stat[j].st_mode & S_IFMT) != S_IFREG) {
-+	    || !S_ISREG(test_stat[j].st_mode)) {
- 	    omit = TRUE;
- 	} else {
- 	    for (k = 0; k < j; k++) {
-@@ -1075,7 +1093,7 @@
- 	    }
- 	}
- 	if (omit) {
--	    T(("Path %s is a duplicate", termpaths[j]));
-+	    TR(TRACE_DATABASE, ("Path %s is a duplicate", termpaths[j]));
- 	    for (k = j + 1; k < filecount; k++) {
- 		termpaths[k - 1] = termpaths[k];
- 		test_stat[k - 1] = test_stat[k];
-@@ -1100,7 +1118,7 @@
- 
- 	for (i = 0; i < filecount; i++) {
- 
--	    T(("Looking for %s in %s", tn, termpaths[i]));
-+	    TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i]));
- 	    if (_nc_access(termpaths[i], R_OK) == 0
- 		&& (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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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 <curses.priv.h>
- 
--MODULE_ID("$Id: setbuf.c,v 1.16 2010/08/28 21:08:31 tom Exp $")
-+MODULE_ID("$Id: setbuf.c,v 1.17 2011/10/22 16:34:50 tom Exp $")
- 
- /*
-  * If the output file descriptor is connected to a tty (the typical case) it
-@@ -100,7 +100,7 @@
-  * buffer.  So we disable this by default (there may yet be a workaround).
-  */
- NCURSES_EXPORT(void)
--NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered)
-+NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, int buffered)
- {
-     int Cols;
-     int Lines;
-@@ -149,7 +149,7 @@
- #ifdef SETVBUF_REVERSED		/* pre-svr3? */
- 	(void) setvbuf(ofp, buf_ptr, buf_len, buf_len ? _IOFBF : _IOLBF);
- #else
--	(void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len);
-+	(void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, (size_t) buf_len);
- #endif
- #elif HAVE_SETBUFFER
- 	(void) setbuffer(ofp, buf_ptr, (int) buf_len);
-@@ -162,7 +162,7 @@
- 
- #if NCURSES_SP_FUNCS
- NCURSES_EXPORT(void)
--_nc_set_buffer(FILE *ofp, bool buffered)
-+_nc_set_buffer(FILE *ofp, int buffered)
- {
-     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-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-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            *
-@@ -50,7 +50,7 @@
- # endif
- #endif
- 
--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.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);
- }
- 
--#define ret_error(code, fmt, arg)	if (errret) {\
--					    *errret = code;\
--					    return(FALSE); \
--					} else {\
--					    fprintf(stderr, fmt, arg);\
--					    exit(EXIT_FAILURE);\
--					}
--
--#define ret_error0(code, msg)		if (errret) {\
--					    *errret = code;\
--					    return(FALSE);\
--					} else {\
--					    fprintf(stderr, msg);\
--					    exit(EXIT_FAILURE);\
--					}
--
- static bool
- drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
- {
-@@ -156,12 +140,12 @@
- 	if (status == TGETENT_ERR) {
- 	    ret_error0(status, "terminals database is inaccessible\n");
- 	} else if (status == TGETENT_NO) {
--	    ret_error(status, "'%s': unknown terminal type.\n", tname);
-+	    ret_error1(status, "unknown terminal type.\n", tname);
- 	}
-     }
-     result = TRUE;
- #if !USE_REENTRANT
--    strncpy(ttytype, termp->type.term_names, NAMESIZE - 1);
-+    strncpy(ttytype, termp->type.term_names, (size_t) NAMESIZE - 1);
-     ttytype[NAMESIZE - 1] = '\0';
- #endif
- 
-@@ -169,17 +153,27 @@
- 	_nc_tinfo_cmdch(termp, *command_character);
- 
-     if (generic_type) {
--	ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
-+	/*
-+	 * BSD 4.3's termcap contains mis-typed "gn" for wy99.  Do a sanity
-+	 * check before giving up.
-+	 */
-+	if ((VALID_STRING(cursor_address)
-+	     || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
-+	    && VALID_STRING(clear_screen)) {
-+	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
-+	} else {
-+	    ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
-+	}
-     }
-     if (hard_copy) {
--	ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname);
-+	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
-     }
- 
-     return result;
- }
- 
- static int
--drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, bool beepFlag)
-+drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, int beepFlag)
- {
-     SCREEN *sp;
-     int res = ERR;
-@@ -277,7 +271,7 @@
- 
- static void
- drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB,
--	     bool fore,
-+	     int fore,
- 	     int color,
- 	     NCURSES_SP_OUTC outc)
- {
-@@ -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 @@
- }
- 
- static int
--drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf)
-+drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, int setFlag, TTY * buf)
- {
-     SCREEN *sp = TCB->csp;
-     TERMINAL *_term = (TERMINAL *) TCB;
-@@ -497,7 +511,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;
-@@ -620,15 +634,13 @@
- static void
- drv_init(TERMINAL_CONTROL_BLOCK * TCB)
- {
--    SCREEN *sp;
-     TERMINAL *trm;
- 
-     AssertTCB();
- 
-     trm = (TERMINAL *) TCB;
--    sp = TCB->csp;
- 
--    TCB->info.initcolor = initialize_color;
-+    TCB->info.initcolor = VALID_STRING(initialize_color);
-     TCB->info.canchange = can_change;
-     TCB->info.hascolor = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
- 			   && (((set_foreground != NULL)
-@@ -665,7 +677,7 @@
- #define InPalette(n)	((n) >= 0 && (n) < MAX_PALETTE)
- 
- static void
--drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, short pair, short f, short b)
-+drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, int pair, int f, int b)
- {
-     SCREEN *sp;
- 
-@@ -712,7 +724,7 @@
- 
- static void
- drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB,
--	      short color, short r, short g, short b)
-+	      int color, int r, int g, int b)
- {
-     SCREEN *sp = TCB->csp;
- 
-@@ -726,9 +738,9 @@
- 
- static void
- drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
--	     short old_pair,
--	     short pair,
--	     bool reverse,
-+	     int old_pair,
-+	     int pair,
-+	     int reverse,
- 	     NCURSES_SP_OUTC outc)
- {
-     SCREEN *sp = TCB->csp;
-@@ -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 @@
- }
- 
- static int
--drv_testmouse(TERMINAL_CONTROL_BLOCK * TCB, int delay)
-+drv_testmouse(TERMINAL_CONTROL_BLOCK * TCB,
-+	      int delay
-+	      EVENTLIST_2nd(_nc_eventlist * evl))
- {
-     int rc = 0;
-     SCREEN *sp;
-@@ -899,7 +913,7 @@
- }
- 
- static void
--drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, bool OnFlag)
-+drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, int OnFlag)
- {
-     SCREEN *sp = TCB->csp;
- 
-@@ -1176,7 +1190,7 @@
-     if ((pthread_self) && (pthread_kill) && (pthread_equal))
- 	_nc_globals.read_thread = pthread_self();
- # endif
--    n = read(sp->_ifd, &c2, 1);
-+    n = read(sp->_ifd, &c2, (size_t) 1);
- #if USE_PTHREADS_EINTR
-     _nc_globals.read_thread = 0;
- #endif
-@@ -1225,7 +1239,7 @@
- }
- 
- static int
--drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag)
-+drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, int flag)
- {
-     int ret = ERR;
-     SCREEN *sp;
-@@ -1251,7 +1265,7 @@
- }
- 
- static int
--drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, bool flag)
-+drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, int flag)
- {
-     SCREEN *sp;
-     int code = ERR;
-@@ -1264,7 +1278,8 @@
-     if (c >= 0) {
- 	unsigned ch = (unsigned) c;
- 	if (flag) {
--	    while ((s = _nc_expand_try(sp->_key_ok, ch, &count, 0)) != 0
-+	    while ((s = _nc_expand_try(sp->_key_ok,
-+				       ch, &count, (size_t) 0)) != 0
- 		   && _nc_remove_key(&(sp->_key_ok), ch)) {
- 		code = _nc_add_to_try(&(sp->_keytry), s, ch);
- 		free(s);
-@@ -1273,7 +1288,8 @@
- 		    break;
- 	    }
- 	} else {
--	    while ((s = _nc_expand_try(sp->_keytry, ch, &count, 0)) != 0
-+	    while ((s = _nc_expand_try(sp->_keytry,
-+				       ch, &count, (size_t) 0)) != 0
- 		   && _nc_remove_key(&(sp->_keytry), ch)) {
- 		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-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-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,21 +39,15 @@
- #include <curses.priv.h>
- #include <hashed_db.h>
- 
--#include <sys/stat.h>
--
- #include <tic.h>
- 
--#ifndef S_ISDIR
--#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)
--#endif
--
- #if 1
- #define TRACE_OUT(p) DEBUG(2, p)
- #else
- #define TRACE_OUT(p)		/*nothing */
- #endif
- 
--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.86 2012/06/16 16:59:05 tom Exp $")
- 
- static int total_written;
- 
-@@ -76,7 +70,7 @@
-     DEBUG(1, ("Created %s", filename));
- 
-     if (write_object(tp, buffer, &offset, limit) == ERR
--	|| fwrite(buffer, sizeof(char), offset, fp) != offset) {
-+	|| fwrite(buffer, sizeof(char), (size_t) offset, fp) != offset) {
- 	_nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename);
-     }
- 
-@@ -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 */
- 
- static int
--make_db_path(char *dst, const char *src, unsigned limit)
-+make_db_path(char *dst, const char *src, size_t limit)
- {
-     int rc = -1;
-     const char *top = _nc_tic_dir(0);
- 
-     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
-     if (rc == 0) {
--	if (_nc_is_dir_path(dst)) {
--	    rc = -1;
--	} else {
--	    static const char suffix[] = DBM_SUFFIX;
--	    unsigned have = strlen(dst);
--	    unsigned need = strlen(suffix);
--	    if (have > need && strcmp(dst + have - need, suffix)) {
--		if (have + need <= limit)
--		    strcat(dst, suffix);
--		else
--		    rc = -1;
-+	static const char suffix[] = DBM_SUFFIX;
-+	size_t have = strlen(dst);
-+	size_t need = strlen(suffix);
-+	if (have > need && strcmp(dst + (int) (have - need), suffix)) {
-+	    if (have + need <= limit) {
-+		_nc_STRCAT(dst, suffix, limit);
-+	    } else {
-+		rc = -1;
- 	    }
-+	} else if (_nc_is_dir_path(dst)) {
-+	    rc = -1;
- 	}
-     }
- #endif
-@@ -164,10 +157,11 @@
- #if USE_HASHED_DB
- 	DB *capdbp;
- 
--	if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL)
-+	if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL) {
- 	    rc = -1;
--	else if (_nc_db_close(capdbp) < 0)
-+	} else if (_nc_db_close(capdbp) < 0) {
- 	    rc = -1;
-+	}
- #else
- 	struct stat statbuf;
- 
-@@ -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);
- 	    }
--	    _nc_db_close(capdb);
- 	}
-     }
- #else /* !USE_HASHED_DB */
-@@ -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);
- }
- 
--#define Write(buf, size, count) fake_write(buffer, offset, limit, (char *) buf, count, size)
-+#define Write(buf, size, count) fake_write(buffer, offset, (size_t) limit, (char *) buf, (size_t) count, (size_t) size)
- 
- #undef LITTLE_ENDIAN		/* BSD/OS defines this as a feature macro */
- #define HI(x)			((x) / 256)
-@@ -706,7 +718,7 @@
- 	    return (ERR);
- 
- 	nextfree = compute_offsets(tp->Strings + STRCOUNT,
--				   tp->ext_Strings,
-+				   (size_t) tp->ext_Strings,
- 				   offsets);
- 	TRACE_OUT(("after extended string capabilities, nextfree=%d", nextfree));
- 
-@@ -714,7 +726,7 @@
- 	    return (ERR);
- 
- 	nextfree += compute_offsets(tp->ext_Names,
--				    extcnt,
-+				    (size_t) extcnt,
- 				    offsets + tp->ext_Strings);
- 	TRACE_OUT(("after extended capnames, nextfree=%d", nextfree));
- 	strmax = tp->ext_Strings + extcnt;
-@@ -742,7 +754,7 @@
- 
- 	TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset));
- 	if (tp->ext_Numbers) {
--	    convert_shorts(buf, tp->Numbers + NUMCOUNT, tp->ext_Numbers);
-+	    convert_shorts(buf, tp->Numbers + NUMCOUNT, (size_t) tp->ext_Numbers);
- 	    if (Write(buf, 2, tp->ext_Numbers) != tp->ext_Numbers)
- 		return (ERR);
- 	}
-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-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-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            *
-@@ -47,7 +47,7 @@
- 
- #include <ctype.h>
- 
--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.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 @@
- 	 * end of each line.  This is useful in case the program dies. 
- 	 */
- #if HAVE_SETVBUF		/* ANSI */
--	(void) setvbuf(TraceFP, (char *) 0, _IOLBF, 0);
-+	(void) setvbuf(TraceFP, (char *) 0, _IOLBF, (size_t) 0);
- #elif HAVE_SETBUF /* POSIX */
- 	(void) setbuffer(TraceFP, (char *) 0);
- #endif
-@@ -185,9 +185,9 @@
- 	if ((pthread_self))
- # endif
- #ifdef __MINGW32__
--	    fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self().p);
-+	    fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self().p);
- #else
--	    fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self());
-+	    fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self());
- #endif
- #endif
- 	if (before || after) {
-@@ -218,7 +218,7 @@
- 
- /* Trace 'bool' return-values */
- NCURSES_EXPORT(NCURSES_BOOL)
--_nc_retrace_bool(NCURSES_BOOL code)
-+_nc_retrace_bool(int code)
- {
-     T((T_RETURN("%s"), code ? "TRUE" : "FALSE"));
-     return code;
-@@ -226,10 +226,10 @@
- 
- /* Trace 'char' return-values */
- NCURSES_EXPORT(char)
--_nc_retrace_char(char code)
-+_nc_retrace_char(int code)
- {
-     T((T_RETURN("%c"), 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-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.79 2012/02/22 22:40:24 tom Exp $")
- 
- #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
- 
-+#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;
-     char temp[80];
--    char *result = _nc_trace_buf(bufnum, BUFSIZ);
-+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
- 
-     if (result != 0) {
- 	unsigned save_nc_tracing = _nc_tracing;
- 
- 	_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;
- #endif
--    if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
-+    if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
- 	char *cp;
- 	char *found = 0;
- 	const ALT_NAMES *strp;
-@@ -271,10 +279,10 @@
- _tracechtype2(int bufnum, chtype ch)
- {
-     const char *found;
--    char *result = _nc_trace_buf(bufnum, BUFSIZ);
-+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
- 
-     if (result != 0) {
--	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)
- {
--    char *result = _nc_trace_buf(bufnum, BUFSIZ);
-+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
-     attr_t attr;
-     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-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 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_tracebits.c,v 1.19 2011/01/09 00:23:03 tom Exp $")
--
--#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
--#define _POSIX_SOURCE
--#endif
-+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-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 @@
- 
- #include <curses.priv.h>
- 
--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.20 2012/02/22 22:34:31 tom Exp $")
- 
- #ifdef TRACE
- 
-@@ -103,13 +103,14 @@
- NCURSES_EXPORT(char *)
- _nc_trace_bufcat(int bufnum, const char *value)
- {
--    char *buffer = _nc_trace_alloc(bufnum, 0);
-+    char *buffer = _nc_trace_alloc(bufnum, (size_t) 0);
-     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-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-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 <tic.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: visbuf.c,v 1.37 2010/05/29 18:51:41 tom Exp $")
-+MODULE_ID("$Id: visbuf.c,v 1.40 2012/02/22 22:40:24 tom Exp $")
- 
- #define NUM_VISBUFS 4
- 
-@@ -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)
- {
--    char *result = _nc_trace_buf(bufnum, BUFSIZ);
-+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
-     int first;
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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            *
-@@ -73,7 +73,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: hashmap.c,v 1.62 2010/04/24 23:46:07 tom Exp $")
-+MODULE_ID("$Id: hashmap.c,v 1.63 2011/10/22 16:34:50 tom Exp $")
- 
- #ifdef HASHDEBUG
- 
-@@ -163,7 +163,7 @@
-  * effective. 'blank' indicates whether the line 'to' would become blank.
-  */
- static NCURSES_INLINE bool
--cost_effective(SCREEN *sp, const int from, const int to, const bool blank)
-+cost_effective(SCREEN *sp, const int from, const int to, const int blank)
- {
-     int new_from;
- 
-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-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
- #endif
- 
--MODULE_ID("$Id: lib_mvcur.c,v 1.126 2011/01/22 19:48:21 tom Exp $")
-+MODULE_ID("$Id: lib_mvcur.c,v 1.127 2011/10/22 16:09:52 tom Exp $")
- 
- #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
- 
-@@ -549,7 +549,7 @@
- 	      int from_x,
- 	      int to_y,
- 	      int to_x,
--	      bool ovw)
-+	      int ovw)
- /* move via local motions (cuu/cuu1/cud/cud1/cub1/cub/cuf1/cuf/vpa/hpa) */
- {
-     string_desc save;
-@@ -770,7 +770,7 @@
-  */
- 
- static NCURSES_INLINE int
--onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
-+onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, int ovw)
- /* onscreen move from (yold, xold) to (ynew, xnew) */
- {
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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,11 +42,7 @@
- 
- #include <SigAction.h>
- 
--#if SVR4_ACTION && !defined(_POSIX_SOURCE)
--#define _POSIX_SOURCE
--#endif
--
--MODULE_ID("$Id: lib_tstp.c,v 1.41 2010/05/15 21:31:12 tom Exp $")
-+MODULE_ID("$Id: lib_tstp.c,v 1.45 2011/10/22 15:37:42 tom Exp $")
- 
- #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
- #define USE_SIGTSTP 1
-@@ -244,16 +240,19 @@
-     SCREEN *sp = CURRENT_SCREEN;
- 
-     /*
--     * Actually, doing any sort of I/O from within an signal handler is
--     * "unsafe".  But we'll _try_ to clean up the screen and terminal
--     * settings on the way out.
-+     * Much of this is unsafe from a signal handler.  But we'll _try_ to clean
-+     * up the screen and terminal settings on the way out.
-+     *
-+     * There are at least the following problems:
-+     * 1) Walking the SCREEN list is unsafe, since all list management
-+     *    is done without any signal blocking.
-+     * 2) On systems which have REENTRANT turned on, set_term() uses
-+     *    _nc_lock_global() which could deadlock or misbehave in other ways.
-+     * 3) endwin() calls all sorts of stuff, many of which use stdio or
-+     *    other library functions which are clearly unsafe.
-      */
-     if (!_nc_globals.cleanup_nested++
--	&& (sig == SIGINT
--#ifdef SIGQUIT
--	    || sig == SIGQUIT
--#endif
--	)) {
-+	&& (sig == SIGINT || sig == SIGTERM)) {
- #if HAVE_SIGACTION || HAVE_SIGVEC
- 	sigaction_t act;
- 	sigemptyset(&act.sa_mask);
-@@ -274,11 +273,11 @@
- 		set_term(scan);
- 		NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);
- 		if (sp)
--		    sp->_endwin = FALSE;	/* in case we have an atexit! */
-+		    sp->_endwin = FALSE;	/* in case of reuse */
- 	    }
- 	}
-     }
--    exit(EXIT_FAILURE);
-+    _exit(EXIT_FAILURE);
- }
- 
- #if USE_SIGWINCH
-@@ -364,7 +363,7 @@
-  * the caller later changes its mind, but that doesn't seem correct.
-  */
- NCURSES_EXPORT(void)
--_nc_signal_handler(bool enable)
-+_nc_signal_handler(int enable)
- {
-     T((T_CALLED("_nc_signal_handler(%d)"), enable));
- #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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -53,6 +53,11 @@
- #include <OS.h>
- #endif
- 
-+#if USE_KLIBC_KBD
-+#define INCL_KBD
-+#include <os2.h>
-+#endif
-+
- #if USE_FUNC_POLL
- # if HAVE_SYS_TIME_H
- #  include <sys/time.h>
-@@ -70,10 +75,10 @@
- #endif
- #undef CUR
- 
--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.64 2012/02/18 20:32:55 tom Exp $")
- 
- static long
--_nc_gettime(TimeType * t0, bool first)
-+_nc_gettime(TimeType * t0, int first)
- {
-     long res;
- 
-@@ -184,6 +189,12 @@
-     fd_set set;
- #endif
- 
-+#if USE_KLIBC_KBD
-+    fd_set saved_set;
-+    KBDKEYINFO ki;
-+    struct timeval tv;
-+#endif
-+
-     long starttime, returntime;
- 
-     TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d",
-@@ -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
- 
--    result = poll(fds, (unsigned) count, milliseconds);
-+    result = poll(fds, (size_t) count, milliseconds);
- 
- #ifdef NCURSES_WGETCH_EVENTS
-     if ((mode & TW_EVENT) && evl) {
-@@ -329,10 +341,12 @@
-      */
-     FD_ZERO(&set);
- 
-+#if !USE_KLIBC_KBD
-     if (mode & TW_INPUT) {
- 	FD_SET(sp->_ifd, &set);
- 	count = sp->_ifd + 1;
-     }
-+#endif
-     if ((mode & TW_MOUSE)
- 	&& (fd = sp->_mouse_fd) >= 0) {
- 	FD_SET(fd, &set);
-@@ -352,6 +366,31 @@
-     }
- #endif
- 
-+#if USE_KLIBC_KBD
-+    for (saved_set = set;; set = saved_set) {
-+	if ((mode & TW_INPUT)
-+	    && (sp->_extended_key
-+		|| (KbdPeek(&ki, 0) == 0
-+		    && (ki.fbStatus & KBDTRF_FINAL_CHAR_IN)))) {
-+	    FD_ZERO(&set);
-+	    FD_SET(sp->_ifd, &set);
-+	    result = 1;
-+	    break;
-+	}
-+
-+	tv.tv_sec = 0;
-+	tv.tv_usec = (milliseconds == 0) ? 0 : (10 * 1000);
-+
-+	if ((result = select(count, &set, NULL, NULL, &tv)) != 0)
-+	    break;
-+
-+	/* Time out ? */
-+	if (milliseconds >= 0 && _nc_gettime(&t0, FALSE) >= milliseconds) {
-+	    result = 0;
-+	    break;
-+	}
-+    }
-+#else
-     if (milliseconds >= 0) {
- 	struct timeval ntimeout;
- 	ntimeout.tv_sec = milliseconds / 1000;
-@@ -360,6 +399,7 @@
-     } else {
- 	result = select(count, &set, NULL, NULL, NULL);
-     }
-+#endif
- 
- #ifdef NCURSES_WGETCH_EVENTS
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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            *
-@@ -69,7 +69,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_vidattr.c,v 1.61 2010/06/05 22:22:04 tom Exp $")
-+MODULE_ID("$Id: lib_vidattr.c,v 1.62 2011/05/28 21:22:04 tom Exp $")
- 
- #define doPut(mode) \
- 	TPUTS_TRACE(#mode); \
-@@ -341,42 +341,44 @@
-     chtype attrs = A_NORMAL;
- 
-     T((T_CALLED("termattrs(%p)"), (void *) SP_PARM));
-+
-+    if (HasTerminal(SP_PARM)) {
- #ifdef USE_TERM_DRIVER
--    if (HasTerminal(SP_PARM))
- 	attrs = CallDriver(SP_PARM, conattr);
- #else
- 
--    if (enter_alt_charset_mode)
--	attrs |= A_ALTCHARSET;
-+	if (enter_alt_charset_mode)
-+	    attrs |= A_ALTCHARSET;
- 
--    if (enter_blink_mode)
--	attrs |= A_BLINK;
-+	if (enter_blink_mode)
-+	    attrs |= A_BLINK;
- 
--    if (enter_bold_mode)
--	attrs |= A_BOLD;
-+	if (enter_bold_mode)
-+	    attrs |= A_BOLD;
- 
--    if (enter_dim_mode)
--	attrs |= A_DIM;
-+	if (enter_dim_mode)
-+	    attrs |= A_DIM;
- 
--    if (enter_reverse_mode)
--	attrs |= A_REVERSE;
-+	if (enter_reverse_mode)
-+	    attrs |= A_REVERSE;
- 
--    if (enter_standout_mode)
--	attrs |= A_STANDOUT;
-+	if (enter_standout_mode)
-+	    attrs |= A_STANDOUT;
- 
--    if (enter_protected_mode)
--	attrs |= A_PROTECT;
-+	if (enter_protected_mode)
-+	    attrs |= A_PROTECT;
- 
--    if (enter_secure_mode)
--	attrs |= A_INVIS;
-+	if (enter_secure_mode)
-+	    attrs |= A_INVIS;
- 
--    if (enter_underline_mode)
--	attrs |= A_UNDERLINE;
-+	if (enter_underline_mode)
-+	    attrs |= A_UNDERLINE;
- 
--    if (SP_PARM->_coloron)
--	attrs |= A_COLOR;
-+	if (SP_PARM->_coloron)
-+	    attrs |= A_COLOR;
- 
- #endif
-+    }
-     returnChtype(attrs);
- }
- 
-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-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-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            *
-@@ -82,7 +82,7 @@
- 
- #include <ctype.h>
- 
--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.268 2012/05/12 21:02:00 tom Exp $")
- 
- /*
-  * This define controls the line-breakout optimization.  Every once in a
-@@ -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;
- 	fds[0].events = POLLIN;
--	if (poll(fds, 1, 0) > 0) {
-+	if (poll(fds, (size_t) 1, 0) > 0) {
- 	    have_pending = TRUE;
- 	}
- #elif defined(__BEOS__)
-@@ -677,6 +676,9 @@
- 
-     T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM));
- 
-+    if (SP_PARM == 0)
-+	returnCode(ERR);
-+
- #if !USE_REENTRANT
-     /*
-      * It is "legal" but unlikely that an application could assign a new
-@@ -1076,7 +1078,7 @@
- */
- 
- static void
--ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, bool needclear)
-+ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, int needclear)
- {
-     int j;
- 
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 2002-2003,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2009,2011 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_box_set.c,v 1.5 2009/10/24 22:36:56 tom Exp $")
-+MODULE_ID("$Id: lib_box_set.c,v 1.6 2011/06/25 19:02:07 Vassili.Courzakis Exp $")
- 
- NCURSES_EXPORT(int)
- wborder_set(WINDOW *win,
-@@ -52,7 +52,7 @@
-     NCURSES_SIZE_T endx, endy;
-     NCURSES_CH_T wls, wrs, wts, wbs, wtl, wtr, wbl, wbr;
- 
--    T((T_CALLED("wborder(%p,%s,%s,%s,%s,%s,%s,%s,%s)"),
-+    T((T_CALLED("wborder_set(%p,%s,%s,%s,%s,%s,%s,%s,%s)"),
-        (void *) win,
-        _tracech_t2(1, ls),
-        _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-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-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 @@
- 
- #include <curses.priv.h>
- 
--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.26 2012/03/24 18:37:17 tom Exp $")
- 
- /* 
-  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
-@@ -58,9 +58,9 @@
- 		      (void *) wcval, _nc_viswbuf(wch),
- 		      (unsigned long) attrs, color_pair, opts));
- 
--    len = (unsigned) wcslen(wch);
-     if (opts != NULL
--	|| (len > 1 && wcwidth(wch[0]) < 0)) {
-+	|| wch == NULL
-+	|| ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
- 	code = ERR;
-     } else {
- 	if (len > CCHARW_MAX)
-@@ -80,7 +80,7 @@
- 	memset(wcval, 0, sizeof(*wcval));
- 
- 	if (len != 0) {
--	    SetAttr(*wcval, attrs | (attr_t) ColorPair(color_pair));
-+	    SetAttr(*wcval, attrs);
- 	    SetPair(CHDEREF(wcval), color_pair);
- 	    memcpy(&wcval->chars, wch, len * sizeof(wchar_t));
- 	    TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len,
-@@ -110,8 +110,8 @@
- 		      (void *) color_pair,
- 		      opts));
- 
--    if (opts == NULL) {
--	len = ((wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
-+    if (opts == NULL && wcval != NULL) {
-+	len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX))
- 	       ? (int) (wp - wcval->chars)
- 	       : CCHARW_MAX);
- 
-@@ -126,7 +126,7 @@
- 	} else if (len >= 0) {
- 	    *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
- 	    *color_pair = (short) GetPair(*wcval);
--	    wmemcpy(wch, wcval->chars, (unsigned) len);
-+	    wmemcpy(wch, wcval->chars, (size_t) len);
- 	    wch[len] = L'\0';
- 	    code = OK;
- 	}
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2010,2011 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 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_get_wch.c,v 1.22 2010/08/28 21:00:35 tom Exp $")
-+MODULE_ID("$Id: lib_get_wch.c,v 1.23 2011/05/28 23:00:29 tom Exp $")
- 
- NCURSES_EXPORT(int)
- wget_wch(WINDOW *win, wint_t *result)
-@@ -106,7 +106,10 @@
-     } else {
- 	code = ERR;
-     }
--    *result = (wint_t) value;
-+
-+    if (result != 0)
-+	*result = (wint_t) value;
-+
-     _nc_unlock_global(curses);
-     T(("result %#o", value));
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 2002-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2009,2011 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_get_wstr.c,v 1.12 2009/10/24 22:38:11 tom Exp $")
-+MODULE_ID("$Id: lib_get_wstr.c,v 1.13 2011/10/22 16:31:35 tom Exp $")
- 
- static int
- wadd_wint(WINDOW *win, wint_t *src)
-@@ -49,7 +49,7 @@
- 
-     wch[0] = (wchar_t) (*src);
-     wch[1] = 0;
--    setcchar(&tmp, wch, A_NORMAL, 0, NULL);
-+    setcchar(&tmp, wch, A_NORMAL, (short) 0, NULL);
-     return wadd_wch(win, &tmp);
- }
- 
-@@ -58,7 +58,7 @@
-  * or other character, and handles reverse wraparound.
-  */
- static wint_t *
--WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, bool echoed)
-+WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, int echoed)
- {
-     if (last > first) {
- 	*--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-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 @@
- /****************************************************************************
-- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2010,2011 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_ins_wch.c,v 1.16 2010/12/19 01:34:04 tom Exp $")
-+MODULE_ID("$Id: lib_ins_wch.c,v 1.17 2011/10/22 16:34:50 tom Exp $")
- 
- /*
-  * Insert the given character, updating the current location to simplify
-@@ -132,7 +132,7 @@
- 		    (void) setcchar(&tmp_cchar,
- 				    &tmp_wchar,
- 				    WA_NORMAL,
--				    0,
-+				    (short) 0,
- 				    (void *) 0);
- 		    code = _nc_insert_wch(win, &tmp_cchar);
- 		} 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-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 @@
- /****************************************************************************
-- * Copyright (c) 2002-2004,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2009,2011 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_inwstr.c,v 1.5 2009/10/24 22:37:29 tom Exp $")
-+MODULE_ID("$Id: lib_inwstr.c,v 1.6 2011/05/28 22:49:49 tom Exp $")
- 
- NCURSES_EXPORT(int)
- winnwstr(WINDOW *win, wchar_t *wstr, int n)
-@@ -93,8 +93,13 @@
- winwstr(WINDOW *win, wchar_t *wstr)
- {
-     int result = OK;
-+
-     T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
--    if (winnwstr(win, wstr, CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR)
-+    if (win == 0) {
-+	result = ERR;
-+    } else if (winnwstr(win, wstr,
-+			CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) {
- 	result = ERR;
-+    }
-     returnCode(result);
- }
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2003-2002,2011 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 @@
- #include <wctype.h>
- #endif
- 
--MODULE_ID("$Id: lib_slk_wset.c,v 1.11 2005/01/16 01:03:53 tom Exp $")
-+MODULE_ID("$Id: lib_slk_wset.c,v 1.13 2011/10/22 15:52:20 tom Exp $")
- 
- NCURSES_EXPORT(int)
- slk_wset(int i, const wchar_t *astr, int format)
-@@ -53,19 +53,21 @@
- 
-     T((T_CALLED("slk_wset(%d, %s, %d)"), i, _nc_viswbuf(astr), format));
- 
--    init_mb(state);
--    str = astr;
--    if ((arglen = wcsrtombs(NULL, &str, 0, &state)) != (size_t) -1) {
--	if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) {
--	    str = astr;
--	    if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) {
--		/* glibc documentation claims that the terminating L'\0'
--		 * is written, but it is not...
--		 */
--		mystr[arglen] = 0;
--		result = slk_set(i, mystr, format);
-+    if (astr != 0) {
-+	init_mb(state);
-+	str = astr;
-+	if ((arglen = wcsrtombs(NULL, &str, (size_t) 0, &state)) != (size_t) -1) {
-+	    if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) {
-+		str = astr;
-+		if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) {
-+		    /* glibc documentation claims that the terminating L'\0'
-+		     * is written, but it is not...
-+		     */
-+		    mystr[arglen] = 0;
-+		    result = slk_set(i, mystr, format);
-+		}
-+		free(mystr);
- 	    }
--	    free(mystr);
- 	}
-     }
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2010,2011 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_unget_wch.c,v 1.14 2010/07/24 11:35:21 tom Exp $")
-+MODULE_ID("$Id: lib_unget_wch.c,v 1.15 2011/10/22 16:34:50 tom Exp $")
- 
- /*
-  * Wrapper for wcrtomb() which obtains the length needed for the given
-@@ -55,7 +55,7 @@
- 	const wchar_t *tempp = temp;
- 	temp[0] = source;
- 	temp[1] = 0;
--	result = (int) wcsrtombs(NULL, &tempp, 0, state);
-+	result = (int) wcsrtombs(NULL, &tempp, (size_t) 0, state);
-     } else {
- 	result = (int) wcrtomb(target, source, state);
-     }
-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-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-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 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--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.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)
- NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
- {
--    attr_t attrs;
-+    attr_t attrs = 0;
- 
-     T((T_CALLED("term_attrs()")));
--    attrs = SP_PARM ? NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG) : 0;
-+    if (SP_PARM) {
-+	attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
- 
--    /* these are only supported for wide-character mode */
--    if (enter_horizontal_hl_mode)
--	attrs |= WA_HORIZONTAL;
--    if (enter_left_hl_mode)
--	attrs |= WA_LEFT;
--    if (enter_low_hl_mode)
--	attrs |= WA_LOW;
--    if (enter_right_hl_mode)
--	attrs |= WA_RIGHT;
--    if (enter_top_hl_mode)
--	attrs |= WA_TOP;
--    if (enter_vertical_hl_mode)
--	attrs |= WA_VERTICAL;
-+	/* these are only supported for wide-character mode */
-+	if (enter_horizontal_hl_mode)
-+	    attrs |= WA_HORIZONTAL;
-+	if (enter_left_hl_mode)
-+	    attrs |= WA_LEFT;
-+	if (enter_low_hl_mode)
-+	    attrs |= WA_LOW;
-+	if (enter_right_hl_mode)
-+	    attrs |= WA_RIGHT;
-+	if (enter_top_hl_mode)
-+	    attrs |= WA_TOP;
-+	if (enter_vertical_hl_mode)
-+	    attrs |= WA_VERTICAL;
-+    }
- 
-     returnAttr(attrs);
- }
-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-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 @@
- /****************************************************************************
-- * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2010,2011 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,17 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_wunctrl.c,v 1.14 2010/12/19 01:42:15 tom Exp $")
-+MODULE_ID("$Id: lib_wunctrl.c,v 1.15 2011/05/28 22:06:26 tom Exp $")
- 
- NCURSES_EXPORT(wchar_t *)
- NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc)
- {
-     static wchar_t str[CCHARW_MAX + 1], *wsp;
-+    wchar_t *result;
- 
--    if (Charable(*wc)) {
-+    if (wc == 0) {
-+	result = 0;
-+    } else if (Charable(*wc)) {
- 	const char *p =
- 	NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx
- 				 (unsigned) _nc_to_char((wint_t)CharOf(*wc)));
-@@ -51,9 +54,11 @@
- 	    *wsp++ = (wchar_t) _nc_to_widechar(*p);
- 	}
- 	*wsp = 0;
--	return str;
--    } else
--	return wc->chars;
-+	result = str;
-+    } else {
-+	result = wc->chars;
-+    }
-+    return result;
- }
- 
- #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-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.60 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.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -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@
- 
-+RPATH_LIST	= @RPATH_LIST@
- MK_SHARED_LIB	= @MK_SHARED_LIB@
- 
- 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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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: panel.priv.h,v 1.23 2009/04/11 20:33:55 tom Exp $ */
-+/* $Id: panel.priv.h,v 1.24 2011/05/21 18:55:07 tom Exp $ */
- 
- #ifndef NCURSES_PANEL_PRIV_H
- #define NCURSES_PANEL_PRIV_H 1
-@@ -160,7 +160,7 @@
- ---------------------------------------------------------------------------*/
- #define PANEL_UPDATE(pan,panstart)\
- {  PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\
--   while(pan2) {\
-+   while(pan2 && pan2->win) {\
-       if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\
-         int y, ix1, ix2, iy1, iy2;\
-         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-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.89 2012/08/11 21:31:56 tom Exp $
- ##############################################################################
--# 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 "Software"), #
-@@ -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)
- LDFLAGS		= @EXTRA_LDFLAGS@ @LDFLAGS@
-+RPATH_LIST	= @RPATH_LIST@
- 
- LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
- LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
- LDFLAGS_DEBUG	= $(LDFLAGS) $(CFLAGS_DEBUG)
--LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE) 
-+LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
- LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
- 
- LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
- 
--LIBS_TIC	= @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
--LDFLAGS_TIC	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
-+LIBS_TIC	= @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-+LDFLAGS_TIC	= @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
- 
--LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
--LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
-+LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-+LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
- 
- 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-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
- ##############################################################################
--# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+# Copyright (c) 1998-2006,2011 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"), #
-@@ -26,7 +26,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: capconvert,v 1.4 2006/04/22 21:46:17 tom Exp $
-+# $Id: capconvert,v 1.5 2011/11/12 23:28:07 Robert.Millan Exp $
- #
- # capconvert -- automated conversion from termcap to terminfo
- #
-@@ -77,16 +77,18 @@
- 		# Assumes the terminfo master covers all canned terminal types
- 		exit;
- 	fi
--	if test "$TERM" = "xterm"
--	then
-+	case $TERM in
-+	xterm | xterm-*)
- 		echo "You are running xterm, which usually sets TERMCAP itself."
- 		echo "We can ignore this, because terminfo knows about xterm."
- 		echo "So you will just use the system-wide terminfo tree."
--		exit;
--	else
-+		exit
-+		;;
-+	*)
- 		echo "We will have to make a local one for you anyway, to capture the effect"
- 		echo "of your TERMCAP variable."
--	fi
-+		;;
-+	esac
- else
- 	echo "No system-wide terminfo tree.  We will make you a local one."
- fi
-@@ -109,7 +111,7 @@
- for x in $PATH .
- do
- 	if test $OPT $x/tic
--	then 
-+	then
- 		TIC=$x/tic
- 		break
- 	fi
-@@ -141,7 +143,7 @@
- then
- 	echo "It appears you already have a private terminfo directory"
- 	echo "at $HOME/.terminfo; this seems odd, because TERMINFO"
--	echo "is not defined.  I am not going to second-guess this -- if you" 
-+	echo "is not defined.  I am not going to second-guess this -- if you"
- 	echo "really want me to try auto-configuring for you, remove or"
- 	echo "rename $HOME/terminfo and run me again."
- 	exit;
-@@ -214,7 +216,7 @@
- #
- echo "You now have a private tree under $HOME/.terminfo;"
- echo "the ncurses library will automatically read from it,"
--echo "and ncurses tic will automatically compile entries to it." 
-+echo "and ncurses tic will automatically compile entries to it."
- 
- # We're done unless user has a .termcap file or equivalent named by TERMCAP
- if test -z "$TERMCAP"
-@@ -235,7 +237,7 @@
- 	echo "Done."
- 	echo "Note that editing $HOME/.termcap will no longer change the data curses sees."
- elif test -f "$TERMCAP"
--then 
-+then
- 	echo "Your TERMCAP names the file $TERMCAP.  I will compile that."
- 	eval $TIC $TERMCAP
- 	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-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-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,7 +39,7 @@
- #include "termsort.c"		/* this C file is generated */
- #include <parametrized.h>	/* so is this */
- 
--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.100 2012/06/09 21:44:40 tom Exp $")
- 
- #define INDENT			8
- #define DISCARD(string) string = ABSENT_STRING
-@@ -57,6 +57,7 @@
- static int outform;		/* output format to use */
- static int sortmode;		/* sort mode to use */
- static int width = 60;		/* max line width for listings */
-+static int height = 65535;	/* max number of lines for listings */
- static int column;		/* current column, limited by 'width' */
- static int oldcol;		/* last value of column before wrap */
- static bool pretty;		/* true if we format if-then-else strings */
-@@ -172,11 +173,17 @@
- }
- 
- void
--dump_init(const char *version, int mode, int sort, int twidth, int traceval,
-+dump_init(const char *version,
-+	  int mode,
-+	  int sort,
-+	  int twidth,
-+	  int theight,
-+	  unsigned traceval,
- 	  bool formatted)
- /* set up for entry display */
- {
-     width = twidth;
-+    height = theight;
-     pretty = formatted;
- 
-     /* versions */
-@@ -201,7 +208,7 @@
- 	bool_names = boolnames;
- 	num_names = numnames;
- 	str_names = strnames;
--	separator = twidth ? ", " : ",";
-+	separator = (twidth > 0 && theight > 1) ? ", " : ",";
- 	trailer = "\n\t";
- 	break;
- 
-@@ -209,7 +216,7 @@
- 	bool_names = boolfnames;
- 	num_names = numfnames;
- 	str_names = strfnames;
--	separator = twidth ? ", " : ",";
-+	separator = (twidth > 0 && theight > 1) ? ", " : ",";
- 	trailer = "\n\t";
- 	break;
- 
-@@ -393,8 +400,8 @@
- static void
- wrap_concat(const char *src)
- {
--    unsigned need = strlen(src);
--    unsigned want = strlen(separator) + need;
-+    size_t need = strlen(src);
-+    size_t want = strlen(separator) + need;
- 
-     if (column > INDENT
- 	&& column + (int) want > width) {
-@@ -593,14 +600,28 @@
- 	column = INDENT;	/* FIXME: workaround to prevent empty lines */
-     } else {
- 	strcpy_DYN(&outbuf, tterm->term_names);
-+
-+	/*
-+	 * Colon is legal in terminfo descriptions, but not in termcap.
-+	 */
-+	if (!infodump) {
-+	    char *p = outbuf.text;
-+	    while (*p) {
-+		if (*p == ':') {
-+		    *p = '=';
-+		}
-+		++p;
-+	    }
-+	}
- 	strcpy_DYN(&outbuf, separator);
- 	column = (int) outbuf.used;
--	force_wrap();
-+	if (height > 1)
-+	    force_wrap();
-     }
- 
-     for_each_boolean(j, tterm) {
- 	i = BoolIndirect(j);
--	name = ExtBoolname(tterm, i, bool_names);
-+	name = ExtBoolname(tterm, (int) i, bool_names);
- 	assert(strlen(name) < sizeof(buffer) - EXTRA_CAP);
- 
- 	if (!version_filter(BOOLEAN, i))
-@@ -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;
- 	}
-     }
- 
--    if (column != INDENT)
-+    if (column != INDENT && height > 1)
- 	force_wrap();
- 
-     for_each_number(j, tterm) {
- 	i = NumIndirect(j);
--	name = ExtNumname(tterm, i, num_names);
-+	name = ExtNumname(tterm, (int) i, num_names);
- 	assert(strlen(name) < sizeof(buffer) - EXTRA_CAP);
- 
- 	if (!version_filter(NUMBER, i))
-@@ -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 @@
- 	}
-     }
- 
--    if (column != INDENT)
-+    if (column != INDENT && height > 1)
- 	force_wrap();
- 
-     len += (int) (num_bools
-@@ -670,7 +693,7 @@
- 
-     for_each_string(j, tterm) {
- 	i = StrIndirect(j);
--	name = ExtStrname(tterm, i, str_names);
-+	name = ExtStrname(tterm, (int) i, str_names);
- 	assert(strlen(name) < sizeof(buffer) - EXTRA_CAP);
- 
- 	capability = tterm->Strings[i];
-@@ -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) {
- 	bool trimmed = FALSE;
--	j = outbuf.used;
-+	j = (PredIdx) outbuf.used;
- 	if (j >= 2
- 	    && outbuf.text[j - 1] == '\t'
- 	    && outbuf.text[j - 2] == '\n') {
-@@ -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;
- 	    for (n = STRCOUNT; n < NUM_STRINGS(tterm); n++) {
--		const char *name = ExtStrname(tterm, n, strnames);
-+		const char *name = ExtStrname(tterm, (int) n, strnames);
- 
- 		if (VALID_STRING(tterm->Strings[n])) {
- 		    set_attributes = ABSENT_STRING;
-@@ -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)
- {
--    trim_trailing();
-+    /*
-+     * Trim any remaining whitespace.
-+     */
-+    if (outbuf.used != 0) {
-+	bool infodump = (outform != F_TERMCAP && outform != F_TCONVERR);
-+	char delim = (char) (infodump ? ',' : ':');
-+	int j;
-+
-+	for (j = (int) outbuf.used - 1; j > 0; --j) {
-+	    char ch = outbuf.text[j];
-+	    if (ch == '\n') {
-+		;
-+	    } else if (isspace(UChar(ch))) {
-+		outbuf.used = (size_t) j;
-+	    } else if (!infodump && ch == '\\') {
-+		outbuf.used = (size_t) j;
-+	    } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) {
-+		outbuf.used = (size_t) (j + 1);
-+	    } else {
-+		break;
-+	    }
-+	}
-+	outbuf.text[outbuf.used] = '\0';
-+    }
-     (void) fputs(outbuf.text, stdout);
-     putchar('\n');
-     return (int) outbuf.used;
- }
- 
- void
--compare_entry(void (*hook) (PredType t, PredIdx i, const char *name),
-+compare_entry(PredHook hook,
- 	      TERMTYPE *tp GCC_UNUSED,
- 	      bool quiet)
- /* compare two entries */
-@@ -1170,7 +1224,7 @@
- 	fputs("    comparing booleans.\n", stdout);
-     for_each_boolean(j, tp) {
- 	i = BoolIndirect(j);
--	name = ExtBoolname(tp, i, bool_names);
-+	name = ExtBoolname(tp, (int) i, bool_names);
- 
- 	if (isObsolete(outform, name))
- 	    continue;
-@@ -1182,7 +1236,7 @@
- 	fputs("    comparing numbers.\n", stdout);
-     for_each_number(j, tp) {
- 	i = NumIndirect(j);
--	name = ExtNumname(tp, i, num_names);
-+	name = ExtNumname(tp, (int) i, num_names);
- 
- 	if (isObsolete(outform, name))
- 	    continue;
-@@ -1194,7 +1248,7 @@
- 	fputs("    comparing strings.\n", stdout);
-     for_each_string(j, tp) {
- 	i = StrIndirect(j);
--	name = ExtStrname(tp, i, str_names);
-+	name = ExtStrname(tp, (int) i, str_names);
- 
- 	if (isObsolete(outform, name))
- 	    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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 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,9 +32,8 @@
-  *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
--
- /*
-- * $Id: dump_entry.h,v 1.30 2008/07/12 20:23:03 tom Exp $
-+ * $Id: dump_entry.h,v 1.32 2011/08/06 16:33:05 tom Exp $
-  *
-  * Dump control definitions and variables
-  */
-@@ -64,16 +63,17 @@
- 
- typedef unsigned PredType;
- typedef unsigned PredIdx;
--typedef int (*PredFunc)(PredType, PredIdx);
-+typedef int (*PredFunc) (PredType, PredIdx);
-+typedef void (*PredHook) (PredType, PredIdx, const char *);
- 
- extern NCURSES_CONST char *nametrans(const char *);
- extern int fmt_entry(TERMTYPE *, PredFunc, bool, bool, bool, int);
- extern int show_entry(void);
--extern void compare_entry(void (*)(PredType, PredIdx, const char *), TERMTYPE *, bool);
-+extern void compare_entry(PredHook, TERMTYPE *, bool);
- extern void dump_entry(TERMTYPE *, bool, bool, int, PredFunc);
--extern void dump_init(const char *, int, int, int, int, bool);
-+extern void dump_init(const char *, int, int, int, int, unsigned, bool);
- extern void dump_uses(const char *, bool);
--extern void repair_acsc(TERMTYPE * tp);
-+extern void repair_acsc(TERMTYPE *tp);
- 
- #define FAIL	-1
- 
-diff -Naur ncurses-5.9.orig/progs/infocmp.c ncurses-5.9/progs/infocmp.c
---- 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-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 <dump_entry.h>
- 
--MODULE_ID("$Id: infocmp.c,v 1.105 2010/05/01 22:04:08 tom Exp $")
-+MODULE_ID("$Id: infocmp.c,v 1.120 2012/06/08 23:05:25 tom Exp $")
- 
- #define L_CURL "{"
- #define R_CURL "}"
-@@ -70,8 +70,9 @@
- static const char *s_absent = "NULL";
- static const char *s_cancel = "NULL";
- static const char *tversion;	/* terminfo version selected */
--static int itrace;		/* trace flag for debugging */
-+static unsigned itrace;		/* trace flag for debugging */
- static int mwidth = 60;
-+static int mheight = 65535;
- static int numbers = 0;		/* format "%'char'" to/from "%{number}" */
- static int outform = F_TERMINFO;	/* output format */
- static int sortmode;		/* sort_mode */
-@@ -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 @@
- }
- 
- static bool
--same_param(const char *table, const char *param, unsigned length)
-+same_param(const char *table, const char *param, size_t length)
- {
-     bool result = FALSE;
-     if (strncmp(table, param, length) == 0) {
-@@ -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;
- 
-     memset(heads, 0, sizeof(heads));
--    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, itrace, FALSE);
-+    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE);
- 
-     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
- 	if (freopen(argv[n], "r", stdin) == 0)
- 	    _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...]"
- 	,""
- 	,"Options:"
-+	,"  -0    print single-row"
- 	,"  -1    print single-column"
-+	,"  -K    use termcap-names and BSD syntax"
- 	,"  -C    use termcap-names"
- 	,"  -F    compare terminfo-files"
- 	,"  -I    use terminfo-names"
-@@ -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';
- 	    (void) printf("static char %-20s[] = %s;\n",
--			  string_variable(ExtStrname(term, n, strnames)), buf);
-+			  string_variable(ExtStrname(term, (int) n, strnames)),
-+			  buf);
- 	}
-     }
-     printf("\n");
-@@ -1116,7 +1298,7 @@
- 	    break;
- 	}
- 	(void) printf("\t/* %3u: %-8s */\t%s,\n",
--		      n, ExtBoolname(term, n, boolnames), str);
-+		      n, ExtBoolname(term, (int) n, boolnames), str);
-     }
-     (void) printf("%s;\n", R_CURL);
- 
-@@ -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;
- 	}
- 	(void) printf("\t/* %3u: %-8s */\t%s,\n", n,
--		      ExtNumname(term, n, numnames), str);
-+		      ExtNumname(term, (int) n, numnames), str);
-     }
-     (void) printf("%s;\n", R_CURL);
- 
-@@ -1150,10 +1332,10 @@
- 	else if (term->Strings[n] == CANCELLED_STRING)
- 	    str = "CANCELLED_STRING";
- 	else {
--	    str = string_variable(ExtStrname(term, n, strnames));
-+	    str = string_variable(ExtStrname(term, (int) n, strnames));
- 	}
- 	(void) printf("\t/* %3u: %-8s */\t%s,\n", n,
--		      ExtStrname(term, n, strnames), str);
-+		      ExtStrname(term, (int) n, strnames), str);
-     }
-     (void) printf("%s;\n", R_CURL);
- 
-@@ -1165,15 +1347,15 @@
- 		      name_initializer("string_ext"), L_CURL);
- 	for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
- 	    (void) printf("\t/* %3u: bool */\t\"%s\",\n",
--			  n, ExtBoolname(term, n, boolnames));
-+			  n, ExtBoolname(term, (int) n, boolnames));
- 	}
- 	for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) {
- 	    (void) printf("\t/* %3u: num */\t\"%s\",\n",
--			  n, ExtNumname(term, n, numnames));
-+			  n, ExtNumname(term, (int) n, numnames));
- 	}
- 	for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
- 	    (void) printf("\t/* %3u: str */\t\"%s\",\n",
--			  n, ExtStrname(term, n, strnames));
-+			  n, ExtStrname(term, (int) n, strnames));
- 	}
- 	(void) printf("%s;\n", R_CURL);
-     }
-@@ -1247,6 +1429,23 @@
-     return terminal;
- }
- 
-+/*
-+ * Show the databases that infocmp knows about.  The location to which it writes is
-+ */
-+static void
-+show_databases(void)
-+{
-+    DBDIRS state;
-+    int offset;
-+    const char *path2;
-+
-+    _nc_first_db(&state, &offset);
-+    while ((path2 = _nc_next_db(&state, &offset)) != 0) {
-+	printf("%s\n", path2);
-+    }
-+    _nc_last_db();
-+}
-+
- /***************************************************************************
-  *
-  * Main sequence
-@@ -1269,7 +1468,7 @@
-     /* Also avoid overflowing smaller stacks on systems like AmigaOS */
-     path *tfile = 0;
-     char **tname = 0;
--    int maxterms;
-+    size_t maxterms;
- 
-     char **myargv;
- 
-@@ -1287,6 +1486,7 @@
- #if NCURSES_XNAMES
-     use_extended_names(FALSE);
- #endif
-+    _nc_strict_bsd = 0;
- 
-     _nc_progname = _nc_rootname(argv[0]);
- 
-@@ -1297,8 +1497,13 @@
- 
-     while ((c = getopt(argc,
- 		       argv,
--		       "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != -1) {
-+		       "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) {
- 	switch (c) {
-+	case '0':
-+	    mwidth = 65535;
-+	    mheight = 1;
-+	    break;
-+
- 	case '1':
- 	    mwidth = 0;
- 	    break;
-@@ -1317,6 +1522,9 @@
- 	    restdir = optarg;
- 	    break;
- 
-+	case 'K':
-+	    _nc_strict_bsd = 1;
-+	    /* FALLTHRU */
- 	case 'C':
- 	    outform = F_TERMCAP;
- 	    tversion = "BSD";
-@@ -1324,6 +1532,11 @@
- 		sortmode = S_TERMCAP;
- 	    break;
- 
-+	case 'D':
-+	    show_databases();
-+	    ExitProgram(EXIT_SUCCESS);
-+	    break;
-+
- 	case 'c':
- 	    compare = C_COMMON;
- 	    break;
-@@ -1441,7 +1654,7 @@
- 	    ExitProgram(EXIT_SUCCESS);
- 
- 	case 'v':
--	    itrace = optarg_to_number();
-+	    itrace = (unsigned) optarg_to_number();
- 	    set_trace_level(itrace);
- 	    break;
- 
-@@ -1460,10 +1673,13 @@
- 	}
-     }
- 
--    maxterms = (argc + 2 - optind);
-+    maxterms = (size_t) (argc + 2 - optind);
-     tfile = typeMalloc(path, maxterms);
-     tname = typeCalloc(char *, maxterms);
-     entries = typeCalloc(ENTRY, maxterms);
-+#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 */
--    dump_init(tversion, outform, sortmode, mwidth, 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-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-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            *
-@@ -30,7 +30,7 @@
-  *  Author: Thomas E. Dickey                    1997-on                     *
-  ****************************************************************************/
- /*
-- * $Id: progs.priv.h,v 1.34 2008/08/03 17:43:05 tom Exp $
-+ * $Id: progs.priv.h,v 1.39 2012/02/22 22:11:27 tom Exp $
-  *
-  *	progs.priv.h
-  *
-@@ -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
- #include <getopt.h>
--#else
-+#elif !defined(HAVE_GETOPT_HEADER)
- /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its
-  * variables doesn't hurt.
-  */
-@@ -109,9 +117,11 @@
- 
- #include <curses.h>
- #include <term_entry.h>
-+#include <nc_termios.h>
- #include <tic.h>
- #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-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-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 @@
- #define USE_LIBTINFO
- #include <progs.priv.h>
- 
--MODULE_ID("$Id: tabs.c,v 1.19 2010/10/23 22:26:01 tom Exp $")
-+MODULE_ID("$Id: tabs.c,v 1.23 2012/02/22 23:57:44 tom Exp $")
- 
- static void usage(void) GCC_NORETURN;
- 
-@@ -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;
- 
-     if (source != 0) {
--	unsigned len = strlen(source);
-+	size_t len = strlen(source);
- 	if (len != 0)
- 	    result = (source[len - 1] != ',');
-     } else {
-@@ -251,7 +252,7 @@
- 
-     if (copied != 0 && *copied != '\0') {
- 	const char *comma = ",";
--	unsigned need = 1 + strlen(copied);
-+	size_t need = 1 + strlen(copied);
- 
- 	if (*copied == ',')
- 	    comma = "";
-@@ -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;
-     NCURSES_CONST char *term_name = 0;
--    const char *mar_list = 0;	/* ignored */
-     char *append = 0;
-     const char *tab_list = 0;
- 
-@@ -446,7 +446,11 @@
- 	    while ((ch = *++option) != '\0') {
- 		switch (ch) {
- 		case 'm':
--		    mar_list = option;
-+		    /*
-+		     * The "+mXXX" option is unimplemented because only the long-obsolete
-+		     * att510d implements smgl, which is needed to support
-+		     * this option.
-+		     */
- 		    break;
- 		default:
- 		    /* 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-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 @@
- /****************************************************************************
-- * 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,6 +35,7 @@
- /*
-  *	tic.c --- Main program for terminfo compiler
-  *			by Eric S. Raymond
-+ *			and Thomas E Dickey
-  *
-  */
- 
-@@ -42,9 +43,12 @@
- #include <sys/stat.h>
- 
- #include <dump_entry.h>
-+#include <hashed_db.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tic.c,v 1.147 2011/02/12 18:39:08 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";
- 
-@@ -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\
- C\
-+D\
- c\
- f\
- G\
- g\
- I\
-+K\
- L\
- N\
- r\
-@@ -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)",
- #endif
-+	"  -K         translate entries to termcap source form with BSD syntax",
- 	"  -C         translate entries to termcap source form",
-+	"  -D         print list of tic's database locations (first must be writable)",
- 	"  -c         check only, validate input without compiling or translating",
- 	"  -e<names>  translate/compile only entries named by comma-separated list",
- 	"  -f         format complex strings for readability",
-@@ -173,7 +181,7 @@
- 
- #define L_BRACE '{'
- #define R_BRACE '}'
--#define S_QUOTE '\'';
-+#define S_QUOTE '\''
- 
- static void
- write_it(ENTRY * ep)
-@@ -216,12 +224,12 @@
- 	    }
- 	    *d = 0;
- 	    if (strlen(result) < strlen(s))
--		strcpy(s, result);
-+		_nc_STRCPY(s, result, strlen(s) + 1);
- 	}
-     }
- 
-     _nc_set_type(_nc_first_name(ep->tterm.term_names));
--    _nc_curr_line = ep->startline;
-+    _nc_curr_line = (int) ep->startline;
-     _nc_write_entry(&ep->tterm);
- }
- 
-@@ -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)
- {
-+    char *dst = 0;
-+
-     while (isspace(UChar(*src)))
- 	src++;
-+
-     if (*src != '\0') {
--	char *dst;
- 	size_t len;
- 
--	if ((dst = strdup(src)) == NULL)
-+	if ((dst = strdup(src)) == NULL) {
- 	    failed("strdup");
-+	} else {
-+	    len = strlen(dst);
-+	    while (--len != 0 && isspace(UChar(dst[len])))
-+		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 result;
- }
- 
- static FILE *
--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
-+    char suffix[] = DBM_SUFFIX;
-+    size_t need = strlen(nominal) + sizeof(suffix);
-+    char *result = malloc(need);
-+
-+    _nc_STRCPY(result, nominal, need);
-+    if (strcmp(result + need - sizeof(suffix), suffix)) {
-+	_nc_STRCAT(result, suffix, need);
-+    }
- #else
--    if (tmpnam(name) != 0)
--	result = fopen(name, "w");
-+    char *result = strdup(nominal);
-+#endif
-+
-+    DEBUG(1, ("** stat(%s)", result));
-+    if (stat(result, &sb) >= 0) {
-+#if USE_HASHED_DB
-+	if (!S_ISREG(sb.st_mode)
-+	    || access(result, R_OK | W_OK) != 0) {
-+	    DEBUG(1, ("...not a writable file"));
-+	    free(result);
-+	    result = 0;
-+	}
-+#else
-+	if (!S_ISDIR(sb.st_mode)
-+	    || access(result, R_OK | W_OK | X_OK) != 0) {
-+	    DEBUG(1, ("...not a writable directory"));
-+	    free(result);
-+	    result = 0;
-+	}
- #endif
-+    } else {
-+	/* check if parent is directory and is writable */
-+	unsigned leaf = _nc_pathlast(result);
-+
-+	DEBUG(1, ("...not found"));
-+	if (leaf) {
-+	    char save = result[leaf];
-+	    result[leaf] = 0;
-+	    if (stat(result, &sb) >= 0
-+		&& S_ISDIR(sb.st_mode)
-+		&& access(result, R_OK | W_OK | X_OK) == 0) {
-+		result[leaf] = save;
-+	    } else {
-+		DEBUG(1, ("...parent directory %s is not writable", result));
-+		free(result);
-+		result = 0;
-+	    }
-+	} else {
-+	    DEBUG(1, ("... no parent directory"));
-+	    free(result);
-+	    result = 0;
-+	}
-+    }
-     return result;
- }
- 
-+/*
-+ * Show the databases to which tic could write.  The location to which it
-+ * writes is always the first one.  If none are writable, print an error
-+ * message.
-+ */
-+static void
-+show_databases(const char *outdir)
-+{
-+    bool specific = (outdir != 0) || getenv("TERMINFO") != 0;
-+    const char *result;
-+    const char *tried = 0;
-+
-+    if (outdir == 0) {
-+	outdir = _nc_tic_dir(0);
-+    }
-+    if ((result = valid_db_path(outdir)) != 0) {
-+	printf("%s\n", result);
-+    } else {
-+	tried = outdir;
-+    }
-+
-+    if ((outdir = _nc_home_terminfo())) {
-+	if ((result = valid_db_path(outdir)) != 0) {
-+	    printf("%s\n", result);
-+	} else if (!specific) {
-+	    tried = outdir;
-+	}
-+    }
-+
-+    /*
-+     * If we can write in neither location, give an error message.
-+     */
-+    if (tried) {
-+	fflush(stdout);
-+	fprintf(stderr, "%s: %s (no permission)\n", _nc_progname, tried);
-+	ExitProgram(EXIT_FAILURE);
-+    }
-+}
-+
-+#define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0))
-+
- int
- main(int argc, char *argv[])
- {
-     char my_tmpname[PATH_MAX];
--    int v_opt = -1, debug_level;
-+    char my_altfile[PATH_MAX];
-+    int v_opt = -1;
-+    unsigned debug_level;
-     int smart_defaults = TRUE;
-     char *termcap;
-     ENTRY *qp;
-@@ -486,6 +659,7 @@
-     int sortmode = S_TERMINFO;	/* sort_mode */
- 
-     int width = 60;
-+    int height = 65535;
-     bool formatted = FALSE;	/* reformat complex strings? */
-     bool literal = FALSE;	/* suppress post-processing? */
-     int numbers = 0;		/* format "%'char'" to/from "%{number}" */
-@@ -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);
- #endif
-+    _nc_strict_bsd = 0;
- 
-     /*
-      * Processing arguments is a little complicated, since someone made a
-@@ -520,7 +695,7 @@
-      * be optional.
-      */
-     while ((this_opt = getopt(argc, argv,
--			      "0123456789CILNR:TUVace:fGgo:rstvwx")) != -1) {
-+			      "0123456789CDIKLNR:TUVace:fGgo:rstvwx")) != -1) {
- 	if (isdigit(this_opt)) {
- 	    switch (last_opt) {
- 	    case 'v':
-@@ -530,19 +705,40 @@
- 		width = (width * 10) + (this_opt - '0');
- 		break;
- 	    default:
--		if (this_opt != '1')
-+		switch (this_opt) {
-+		case '0':
-+		    last_opt = this_opt;
-+		    width = 65535;
-+		    height = 1;
-+		    break;
-+		case '1':
-+		    last_opt = this_opt;
-+		    width = 0;
-+		    break;
-+		default:
- 		    usage();
--		last_opt = this_opt;
--		width = 0;
-+		}
- 	    }
- 	    continue;
- 	}
- 	switch (this_opt) {
-+	case 'K':
-+	    _nc_strict_bsd = 1;
-+	    /* the initial version of -K in 20110730 fell-thru here, but the
-+	     * same flag is useful when reading sources -TD
-+	     */
-+	    break;
- 	case 'C':
- 	    capdump = TRUE;
- 	    outform = F_TERMCAP;
- 	    sortmode = S_TERMCAP;
- 	    break;
-+	case 'D':
-+	    debug_level = VtoTrace(v_opt);
-+	    set_trace_level(debug_level);
-+	    show_databases(outdir);
-+	    ExitProgram(EXIT_SUCCESS);
-+	    break;
- 	case 'I':
- 	    infodump = TRUE;
- 	    outform = F_TERMINFO;
-@@ -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;
-     }
- 
--    debug_level = (v_opt > 0) ? v_opt : (v_opt == 0);
-+    debug_level = VtoTrace(v_opt);
-     set_trace_level(debug_level);
- 
-     if (_nc_tracing) {
-@@ -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);
- 	ExitProgram(EXIT_FAILURE);
-     }
- #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) {
- 	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);
-@@ -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) {
- 		if (matches(namelst, qp->tterm.term_names)) {
--		    int j = qp->cend - qp->cstart;
-+		    long j = qp->cend - qp->cstart;
- 		    int len = 0;
- 
- 		    /* this is in case infotocap() generates warnings */
-@@ -767,7 +965,7 @@
- 		    repair_acsc(&qp->tterm);
- 		    dump_entry(&qp->tterm, suppress_untranslatable,
- 			       limited, numbers, NULL);
--		    for (j = 0; j < (int) qp->nuses; j++)
-+		    for (j = 0; j < (long) qp->nuses; j++)
- 			dump_uses(qp->uses[j].name, !capdump);
- 		    len = show_entry();
- 		    if (debug_level != 0 && !limited)
-@@ -811,7 +1009,6 @@
- 	else
- 	    fprintf(log_fp, "No entries written\n");
-     }
--    cleanup(namelst);
-     ExitProgram(EXIT_SUCCESS);
- }
- 
-@@ -915,18 +1112,18 @@
-     return result;
- }
- 
--static int
-+static long
- keypad_index(const char *string)
- {
-     char *test;
-     const char *list = "PQRSwxymtuvlqrsPpn";	/* app-keypad except "Enter" */
-     int ch;
--    int result = -1;
-+    long result = -1;
- 
-     if ((ch = keypad_final(string)) != '\0') {
- 	test = strchr(list, ch);
- 	if (test != 0)
--	    result = (test - list);
-+	    result = (long) (test - list);
-     }
-     return result;
- }
-@@ -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)) {
- 	char final[MAX_KP + 1];
--	int list[MAX_KP];
-+	long list[MAX_KP];
- 	int increase = 0;
- 	int j, k, kk;
--	int last;
--	int test;
-+	long last;
-+	long test;
- 
- 	final[0] = keypad_final(key_a1);
- 	final[1] = keypad_final(key_a3);
-@@ -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))
--	    check_params(tp, ExtStrname(tp, j, strnames), a);
-+	    check_params(tp, ExtStrname(tp, (int) j, strnames), a);
-     }
- 
-     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-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-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            *
-@@ -44,12 +44,23 @@
- #include <hashed_db.h>
- #endif
- 
--MODULE_ID("$Id: toe.c,v 1.52 2010/05/01 22:04:08 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, ".."))
- 
-+typedef struct {
-+    int db_index;
-+    unsigned long checksum;
-+    char *term_name;
-+    char *description;
-+} TERMDATA;
-+
- const char *_nc_progname;
- 
-+static TERMDATA *ptr_termdata;	/* array of terminal data */
-+static size_t use_termdata;	/* actual usage in ptr_termdata[] */
-+static size_t len_termdata;	/* allocated size of ptr_termdata[] */
-+
- #if NO_LEAKS
- #undef ExitProgram
- static void ExitProgram(int code) GCC_NORETURN;
-@@ -61,6 +72,8 @@
- }
- #endif
- 
-+static void failed(const char *) GCC_NORETURN;
-+
- static void
- failed(const char *msg)
- {
-@@ -68,6 +81,148 @@
-     ExitProgram(EXIT_FAILURE);
- }
- 
-+static char *
-+strmalloc(const char *value)
-+{
-+    char *result = strdup(value);
-+    if (result == 0) {
-+	failed("strmalloc");
-+    }
-+    return result;
-+}
-+
-+static TERMDATA *
-+new_termdata(void)
-+{
-+    size_t want = use_termdata + 1;
-+
-+    if (want >= len_termdata) {
-+	len_termdata = (2 * want) + 10;
-+	ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata);
-+    }
-+
-+    return ptr_termdata + use_termdata++;
-+}
-+
-+static int
-+compare_termdata(const void *a, const void *b)
-+{
-+    const TERMDATA *p = (const TERMDATA *) a;
-+    const TERMDATA *q = (const TERMDATA *) b;
-+    int result = strcmp(p->term_name, q->term_name);
-+
-+    if (result == 0) {
-+	result = (p->db_index - q->db_index);
-+    }
-+    return result;
-+}
-+
-+/*
-+ * Sort the array of TERMDATA and print it.  If more than one database is being
-+ * reported, add a column to show which database has a given entry.
-+ */
-+static void
-+show_termdata(int eargc, char **eargv)
-+{
-+    int j, k;
-+    size_t n;
-+
-+    if (use_termdata) {
-+	if (eargc > 1) {
-+	    for (j = 0; j < eargc; ++j) {
-+		for (k = 0; k <= j; ++k) {
-+		    printf("--");
-+		}
-+		printf("> ");
-+		printf("%s\n", eargv[j]);
-+	    }
-+	}
-+	if (use_termdata > 1)
-+	    qsort(ptr_termdata, use_termdata, sizeof(TERMDATA), compare_termdata);
-+	for (n = 0; n < use_termdata; ++n) {
-+
-+	    /*
-+	     * If there is more than one database, show how they differ.
-+	     */
-+	    if (eargc > 1) {
-+		unsigned long check = 0;
-+		k = 0;
-+		for (;;) {
-+		    for (; k < ptr_termdata[n].db_index; ++k) {
-+			printf("--");
-+		    }
-+
-+		    /*
-+		     * If this is the first entry, or its checksum differs
-+		     * from the first entry's checksum, print "*". Otherwise
-+		     * it looks enough like a duplicate to print "+".
-+		     */
-+		    printf("%c-", ((check == 0
-+				    || (check != ptr_termdata[n].checksum))
-+				   ? '*'
-+				   : '+'));
-+		    check = ptr_termdata[n].checksum;
-+
-+		    ++k;
-+		    if ((n + 1) >= use_termdata
-+			|| strcmp(ptr_termdata[n].term_name,
-+				  ptr_termdata[n + 1].term_name)) {
-+			break;
-+		    }
-+		    ++n;
-+		}
-+		for (; k < eargc; ++k) {
-+		    printf("--");
-+		}
-+		printf(":\t");
-+	    }
-+
-+	    (void) printf("%-10s\t%s\n",
-+			  ptr_termdata[n].term_name,
-+			  ptr_termdata[n].description);
-+	}
-+    }
-+}
-+
-+static void
-+free_termdata(void)
-+{
-+    if (ptr_termdata != 0) {
-+	while (use_termdata != 0) {
-+	    --use_termdata;
-+	    free(ptr_termdata[use_termdata].term_name);
-+	    free(ptr_termdata[use_termdata].description);
-+	}
-+	free(ptr_termdata);
-+	ptr_termdata = 0;
-+    }
-+    use_termdata = 0;
-+    len_termdata = 0;
-+}
-+
-+static char **
-+allocArgv(size_t count)
-+{
-+    char **result = typeCalloc(char *, count + 1);
-+    if (result == 0)
-+	failed("realloc eargv");
-+
-+    assert(result != 0);
-+    return result;
-+}
-+
-+static void
-+freeArgv(char **argv)
-+{
-+    if (argv) {
-+	int count = 0;
-+	while (argv[count]) {
-+	    free(argv[count++]);
-+	}
-+	free(argv);
-+    }
-+}
-+
- #if USE_HASHED_DB
- static bool
- make_db_name(char *dst, const char *src, unsigned limit)
-@@ -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
- 
--static bool
--is_database(const char *path)
-+typedef void (DescHook) (int /* db_index */ ,
-+			 int /* db_limit */ ,
-+			 const char * /* term_name */ ,
-+			 TERMTYPE * /* term */ );
-+
-+static const char *
-+term_description(TERMTYPE *tp)
- {
--    bool result = FALSE;
--#if USE_DATABASE
--    if (_nc_is_dir_path(path) && access(path, R_OK | X_OK) == 0) {
--	result = TRUE;
-+    const char *desc;
-+
-+    if ((desc = strrchr(tp->term_names, '|')) == 0 || *++desc == '\0')
-+	desc = "(No description)";
-+
-+    return desc;
-+}
-+
-+/* display a description for the type */
-+static void
-+deschook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp)
-+{
-+    (void) db_index;
-+    (void) db_limit;
-+    (void) printf("%-10s\t%s\n", term_name, term_description(tp));
-+}
-+
-+static unsigned long
-+string_sum(const char *value)
-+{
-+    unsigned long result = 0;
-+
-+    if ((intptr_t) value == (intptr_t) (-1)) {
-+	result = ~result;
-+    } else if (value) {
-+	while (*value) {
-+	    result += UChar(*value);
-+	    ++value;
-+	}
-     }
--#endif
--#if USE_TERMCAP
--    if (_nc_is_file_path(path) && access(path, R_OK) == 0) {
--	result = TRUE;
-+    return result;
-+}
-+
-+static unsigned long
-+checksum_of(TERMTYPE *tp)
-+{
-+    unsigned long result = string_sum(tp->term_names);
-+    unsigned i;
-+
-+    for (i = 0; i < NUM_BOOLEANS(tp); i++) {
-+	result += (unsigned long) (tp->Booleans[i]);
-     }
--#endif
--#if USE_HASHED_DB
--    if (!result) {
--	char filename[PATH_MAX];
--	if (_nc_is_file_path(path) && access(path, R_OK) == 0) {
--	    result = TRUE;
--	} else if (make_db_name(filename, path, sizeof(filename))) {
--	    if (_nc_is_file_path(filename) && access(filename, R_OK) == 0) {
--		result = TRUE;
--	    }
--	}
-+    for (i = 0; i < NUM_NUMBERS(tp); i++) {
-+	result += (unsigned long) (tp->Numbers[i]);
-+    }
-+    for (i = 0; i < NUM_STRINGS(tp); i++) {
-+	result += string_sum(tp->Strings[i]);
-     }
--#endif
-     return result;
- }
- 
-+/* collect data, to sort before display */
- static void
--deschook(const char *cn, TERMTYPE *tp)
--/* display a description for the type */
-+sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp)
- {
--    const char *desc;
--
--    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;
-+    data->checksum = ((db_limit > 1) ? checksum_of(tp) : 0);
-+    data->term_name = strmalloc(term_name);
-+    data->description = strmalloc(term_description(tp));
- }
- 
- #if USE_TERMCAP
- static void
--show_termcap(char *buffer,
--	     void (*hook) (const char *, TERMTYPE *tp))
-+show_termcap(int db_index, int db_limit, char *buffer, DescHook hook)
- {
-     TERMTYPE data;
-     char *next = strchr(buffer, ':');
-@@ -149,20 +334,36 @@
-     if (last)
- 	++last;
- 
--    data.term_names = strdup(buffer);
-+    memset(&data, 0, sizeof(data));
-+    data.term_names = strmalloc(buffer);
-     while ((next = strtok(list, "|")) != 0) {
- 	if (next != last)
--	    hook(next, &data);
-+	    hook(db_index, db_limit, next, &data);
- 	list = 0;
-     }
-     free(data.term_names);
- }
- #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[],
- 	 bool verbosity,
--	 void (*hook) (const char *, TERMTYPE *tp))
-+	 DescHook hook)
- /* apply a function to each entry in given terminfo directories */
- {
-     int i;
-@@ -179,28 +380,35 @@
- 		(void) fprintf(stderr,
- 			       "%s: can't open terminfo directory %s\n",
- 			       _nc_progname, eargv[i]);
--		return (EXIT_FAILURE);
--	    } else if (verbosity)
-+		continue;
-+	    }
-+
-+	    if (verbosity)
- 		(void) printf("#\n#%s:\n#\n", eargv[i]);
- 
- 	    while ((subdir = readdir(termdir)) != 0) {
--		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)) {
- 			/* apply the selected hook function */
--			(*hook) (cn, &lterm);
-+			hook(i, eargc, cn, &lterm);
- 		    }
- 		    _nc_free_termtype(&lterm);
-+		    free(name_2);
- 		}
- 		closedir(entrydir);
- 	    }
- 	    closedir(termdir);
- 	    if (cwd_buf != 0)
- 		free(cwd_buf);
-+	    continue;
- 	}
- #if USE_HASHED_DB
- 	else {
- 	    DB *capdbp;
- 	    char filename[PATH_MAX];
- 
-+	    if (verbosity)
-+		(void) printf("#\n#%s:\n#\n", eargv[i]);
-+
- 	    if (make_db_name(filename, eargv[i], sizeof(filename))) {
- 		if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
- 		    DBT key, data;
-@@ -265,7 +480,7 @@
- 				/* only visit things once, by primary name */
- 				cn = _nc_first_name(lterm.term_names);
- 				/* apply the selected hook function */
--				(*hook) (cn, &lterm);
-+				hook(i, eargc, cn, &lterm);
- 				_nc_free_termtype(&lterm);
- 			    }
- 			}
-@@ -273,6 +488,7 @@
- 		    }
- 
- 		    _nc_db_close(capdbp);
-+		    continue;
- 		}
- 	    }
- 	}
-@@ -280,37 +496,43 @@
- #endif
- #if USE_TERMCAP
- #if HAVE_BSD_CGETENT
--	char *db_array[2];
--	char *buffer = 0;
-+	{
-+	    CGETENT_CONST char *db_array[2];
-+	    char *buffer = 0;
- 
--	if (verbosity)
--	    (void) printf("#\n#%s:\n#\n", eargv[i]);
-+	    if (verbosity)
-+		(void) printf("#\n#%s:\n#\n", eargv[i]);
- 
--	db_array[0] = eargv[i];
--	db_array[1] = 0;
-+	    db_array[0] = eargv[i];
-+	    db_array[1] = 0;
- 
--	if (cgetfirst(&buffer, db_array)) {
--	    show_termcap(buffer, hook);
--	    free(buffer);
--	    while (cgetnext(&buffer, db_array)) {
--		show_termcap(buffer, hook);
-+	    if (cgetfirst(&buffer, db_array) > 0) {
-+		show_termcap(i, eargc, buffer, hook);
- 		free(buffer);
-+		while (cgetnext(&buffer, db_array) > 0) {
-+		    show_termcap(i, eargc, buffer, hook);
-+		    free(buffer);
-+		}
-+		cgetclose();
-+		continue;
- 	    }
- 	}
--	cgetclose();
- #else
- 	/* scan termcap text-file only */
- 	if (_nc_is_file_path(eargv[i])) {
- 	    char buffer[2048];
- 	    FILE *fp;
- 
-+	    if (verbosity)
-+		(void) printf("#\n#%s:\n#\n", eargv[i]);
-+
- 	    if ((fp = fopen(eargv[i], "r")) != 0) {
- 		while (fgets(buffer, sizeof(buffer), fp) != 0) {
- 		    if (*buffer == '#')
- 			continue;
- 		    if (isspace(*buffer))
- 			continue;
--		    show_termcap(buffer, hook);
-+		    show_termcap(i, eargc, buffer, hook);
- 		}
- 		fclose(fp);
- 	    }
-@@ -319,13 +541,18 @@
- #endif
-     }
- 
-+    if (hook == sorthook) {
-+	show_termdata(eargc, eargv);
-+	free_termdata();
-+    }
-+
-     return (EXIT_SUCCESS);
- }
- 
- static void
- usage(void)
- {
--    (void) fprintf(stderr, "usage: %s [-ahuUV] [-v n] [file...]\n", _nc_progname);
-+    (void) fprintf(stderr, "usage: %s [-ahsuUV] [-v n] [file...]\n", _nc_progname);
-     ExitProgram(EXIT_FAILURE);
- }
- 
-@@ -340,23 +567,24 @@
-     unsigned i;
-     int code;
-     int this_opt, last_opt = '?';
--    int v_opt = 0;
-+    unsigned v_opt = 0;
-+    DescHook *hook = deschook;
- 
-     _nc_progname = _nc_rootname(argv[0]);
- 
--    while ((this_opt = getopt(argc, argv, "0123456789ahu:vU:V")) != -1) {
-+    while ((this_opt = getopt(argc, argv, "0123456789ahsu:vU:V")) != -1) {
- 	/* handle optional parameter */
- 	if (isdigit(this_opt)) {
- 	    switch (last_opt) {
- 	    case 'v':
--		v_opt = (this_opt - '0');
-+		v_opt = (unsigned) (this_opt - '0');
- 		break;
- 	    default:
- 		if (isdigit(last_opt))
- 		    v_opt *= 10;
- 		else
- 		    v_opt = 0;
--		v_opt += (this_opt - '0');
-+		v_opt += (unsigned) (this_opt - '0');
- 		last_opt = this_opt;
- 	    }
- 	    continue;
-@@ -368,6 +596,9 @@
- 	case 'h':
- 	    header = TRUE;
- 	    break;
-+	case 's':
-+	    hook = sorthook;
-+	    break;
- 	case 'u':
- 	    direct_dependencies = TRUE;
- 	    report_file = optarg;
-@@ -450,7 +681,7 @@
-      * If we get this far, user wants a simple terminal type listing.
-      */
-     if (optind < argc) {
--	code = typelist(argc - optind, argv + optind, header, deschook);
-+	code = typelist(argc - optind, argv + optind, header, hook);
-     } else if (all_dirs) {
- 	DBDIRS state;
- 	int offset;
-@@ -460,64 +691,37 @@
- 
- 	code = EXIT_FAILURE;
- 	for (pass = 0; pass < 2; ++pass) {
--	    unsigned count = 0;
-+	    size_t count = 0;
- 
- 	    _nc_first_db(&state, &offset);
- 	    while ((path = _nc_next_db(&state, &offset)) != 0) {
--		if (!is_database(path)) {
--		    ;
--		} else if (eargv != 0) {
--		    unsigned n;
--		    int found = FALSE;
--
--		    /* eliminate duplicates */
--		    for (n = 0; n < count; ++n) {
--			if (!strcmp(path, eargv[n])) {
--			    found = TRUE;
--			    break;
--			}
--		    }
--		    if (!found) {
--			eargv[count] = strdup(path);
--			++count;
--		    }
--		} else {
--		    ++count;
-+		if (pass) {
-+		    eargv[count] = strmalloc(path);
- 		}
-+		++count;
- 	    }
- 	    if (!pass) {
--		eargv = typeCalloc(char *, count + 1);
--		if (eargv == 0)
--		    failed("realloc eargv");
--
--		assert(eargv != 0);
-+		eargv = allocArgv(count);
- 	    } else {
--		code = typelist((int) count, eargv, header, deschook);
--		while (count-- > 0)
--		    free(eargv[count]);
--		free(eargv);
-+		code = typelist((int) count, eargv, header, hook);
-+		freeArgv(eargv);
- 	    }
- 	}
-     } else {
- 	DBDIRS state;
- 	int offset;
- 	const char *path;
--	char *eargv[3];
--	int count = 0;
-+	char **eargv = allocArgv(2);
-+	size_t count = 0;
- 
- 	_nc_first_db(&state, &offset);
--	while ((path = _nc_next_db(&state, &offset)) != 0) {
--	    if (is_database(path)) {
--		eargv[count++] = strdup(path);
--		break;
--	    }
-+	if ((path = _nc_next_db(&state, &offset)) != 0) {
-+	    eargv[count++] = strmalloc(path);
- 	}
--	eargv[count] = 0;
- 
--	code = typelist(count, eargv, header, deschook);
-+	code = typelist((int) count, eargv, header, hook);
- 
--	while (count-- > 0)
--	    free(eargv[count]);
-+	freeArgv(eargv);
-     }
-     _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-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 @@
- /****************************************************************************
-- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2009-2010,2011 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,21 +34,21 @@
- 
- #include <transform.h>
- 
--MODULE_ID("$Id: transform.c,v 1.2 2010/09/04 21:16:17 tom Exp $")
-+MODULE_ID("$Id: transform.c,v 1.3 2011/05/14 22:41:17 tom Exp $")
- 
- #ifdef SUFFIX_IGNORED
- static void
--trim_suffix(const char *a, unsigned *len)
-+trim_suffix(const char *a, size_t *len)
- {
-     const char ignore[] = SUFFIX_IGNORED;
- 
-     if (sizeof(ignore) != 0) {
- 	bool trim = FALSE;
--	unsigned need = (sizeof(ignore) - 1);
-+	size_t need = (sizeof(ignore) - 1);
- 
- 	if (*len > need) {
--	    unsigned first = *len - need;
--	    unsigned n;
-+	    size_t first = *len - need;
-+	    size_t n;
- 	    trim = TRUE;
- 	    for (n = first; n < *len; ++n) {
- 		if (tolower(UChar(a[n])) != tolower(UChar(ignore[n - first]))) {
-@@ -69,8 +69,8 @@
- bool
- same_program(const char *a, const char *b)
- {
--    unsigned len_a = strlen(a);
--    unsigned len_b = strlen(b);
-+    size_t len_a = strlen(a);
-+    size_t len_b = strlen(b);
- 
-     trim_suffix(a, &len_a);
-     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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -119,7 +119,7 @@
- #include <dump_entry.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tset.c,v 1.82 2010/05/01 21:42:46 tom Exp $")
-+MODULE_ID("$Id: tset.c,v 1.89 2012/02/22 22:50:47 tom Exp $")
- 
- /*
-  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
-@@ -148,6 +148,10 @@
- #undef CTRL
- #define CTRL(x)	((x) & 0x1f)
- 
-+static void failed(const char *) GCC_NORETURN;
-+static void exit_error(void) GCC_NORETURN;
-+static void err(const char *,...) GCC_NORETURN;
-+
- const char *_nc_progname = "tset";
- 
- static TTY mode, oldmode, original;
-@@ -160,7 +164,10 @@
- static int terasechar = -1;	/* new erase character */
- static int intrchar = -1;	/* new interrupt character */
- static int tkillchar = -1;	/* new kill character */
-+
-+#if HAVE_SIZECHANGE
- static int tlines, tcolumns;	/* window size */
-+#endif
- 
- #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
- 
-@@ -203,13 +210,13 @@
- failed(const char *msg)
- {
-     char temp[BUFSIZ];
--    unsigned len = strlen(_nc_progname) + 2;
-+    size_t len = strlen(_nc_progname) + 2;
- 
-     if ((int) len < (int) sizeof(temp) - 12) {
--	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 @@
- {
-     if (set_tab && clear_all_tabs) {
- 	int c;
-+	int lim =
-+#if HAVE_SIZECHANGE
-+	tcolumns
-+#else
-+	columns
-+#endif
-+	 ;
- 
- 	(void) putc('\r', stderr);	/* Force to left margin. */
- 	tputs(clear_all_tabs, 0, outc);
- 
--	for (c = 8; c < tcolumns; c += 8) {
-+	for (c = 8; c < lim; c += 8) {
- 	    /* Get to the right column.  In BSD tset, this
- 	     * used to try a bunch of half-clever things
- 	     * with cup and hpa, for an average saving of
-@@ -1273,10 +1287,10 @@
-     (void) get_termcap_entry(*argv);
- 
-     if (!noset) {
-+#if HAVE_SIZECHANGE
- 	tcolumns = columns;
- 	tlines = lines;
- 
--#if HAVE_SIZECHANGE
- 	if (opt_w) {
- 	    STRUCT_WINSIZE win;
- 	    /* 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-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 $
-+# $Id: Makefile.in,v 1.109 2011/09/24 15:13:44 nix Exp $
- ##############################################################################
--# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 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"), #
-@@ -102,7 +102,7 @@
- LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
- LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
- 
--TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-+TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
- 
- # use these for linking with all of the libraries
- LIBS_DEFAULT	= $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
-@@ -117,8 +117,8 @@
- LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
- 
- # use these for linking with the tinfo library if we have it, or curses library if not
--LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
--LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
-+LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
-+LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
- 
- LINT		= @LINT@
- LINT_OPTS	= @LINT_OPTS@
-diff -Naur ncurses-5.9.orig/test/README ncurses-5.9/test/README
---- 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 @@
- -------------------------------------------------------------------------------
---- 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             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README,v 1.44 2011/02/26 00:09:25 tom Exp $
-+-- $Id: README,v 1.46 2012/01/21 23:55:22 tom Exp $
- -------------------------------------------------------------------------------
- 
- The programs in this directory are designed to test your newest toy :-)
-@@ -234,7 +234,7 @@
- addnwstr			test: ncurses test_addwstr
- addstr				test: blue bs cardfile gdc hanoi lrtest ncurses savescreen test_addstr
- addwstr				test: ncurses test_addwstr
--assume_default_colors		test: ncurses
-+assume_default_colors		test: background ncurses
- assume_default_colors_sp	-
- attr_get			test: ncurses
- attr_off			test: ncurses
-@@ -670,7 +670,7 @@
- ungetmouse			-
- ungetmouse_sp			-
- untouchwin			lib: form
--use_default_colors		test: filter firework gdc hanoi knight ncurses rain tclock worm xmas
-+use_default_colors		test: background filter firework gdc hanoi knight ncurses rain tclock worm xmas
- use_default_colors_sp		-
- use_env				progs: tput
- 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-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***************************************************************************
--dnl Copyright (c) 2003-2010,2011 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 2003-2011,2012 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.50 2011/03/24 08:28:07 tom Exp $
-+dnl $Id: aclocal.m4,v 1.78 2012/08/04 18:14:48 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -40,6 +40,31 @@
- dnl
- dnl ---------------------------------------------------------------------------
- dnl ---------------------------------------------------------------------------
-+dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03
-+dnl ------------------
-+dnl Conditionally generate script according to whether we're using a given autoconf.
-+dnl
-+dnl $1 = version to compare against
-+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
-+dnl $3 = code to use if AC_ACVERSION is older than $1.
-+define(CF_ACVERSION_CHECK,
-+[
-+ifdef([m4_version_compare],
-+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
-+[CF_ACVERSION_COMPARE(
-+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
-+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50
-+dnl --------------------
-+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
-+dnl                      MAJOR2, MINOR2, TERNARY2,
-+dnl                      PRINTABLE2, not FOUND, FOUND)
-+define(CF_ACVERSION_COMPARE,
-+[ifelse(builtin([eval], [$2 < $5]), 1,
-+[ifelse([$8], , ,[$8])],
-+[ifelse([$9], , ,[$9])])])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
- dnl -------------
- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
-@@ -272,12 +297,33 @@
- }
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
-+dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45
- dnl ----------------
--dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
--dnl in the sharutils 4.2 distribution.
-+dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
-+dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
- AC_DEFUN([CF_ANSI_CC_CHECK],
- [
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+# into CC.  This will not help with broken scripts that wrap the compiler with
-+# options, but eliminates a more common category of user confusion.
-+AC_MSG_CHECKING(\$CC variable)
-+case "$CC" in #(vi
-+*[[\ \	]]-[[IUD]]*)
-+	AC_MSG_RESULT(broken)
-+	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
-+	# humor him...
-+	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
-+	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
-+	CF_ADD_CFLAGS($cf_flags)
-+	;;
-+*)
-+	AC_MSG_RESULT(ok)
-+	;;
-+esac
-+
- AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
- cf_cv_ansi_cc=no
- cf_save_CFLAGS="$CFLAGS"
-@@ -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
- dnl ---------------------------------------------------------------------------
--dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11
-+dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08
- dnl ------------------
- dnl Look for the curses headers.
- AC_DEFUN([CF_CURSES_CPPFLAGS],[
-@@ -542,13 +621,19 @@
- cf_cv_curses_incdir=no
- case $host_os in #(vi
- hpux10.*) #(vi
--	test -d /usr/include/curses_colr && \
--	cf_cv_curses_incdir="-I/usr/include/curses_colr"
-+	if test "x$cf_cv_screen" = "xcurses_colr"
-+	then
-+		test -d /usr/include/curses_colr && \
-+		cf_cv_curses_incdir="-I/usr/include/curses_colr"
-+	fi
- 	;;
- sunos3*|sunos4*)
--	test -d /usr/5lib && \
--	test -d /usr/5include && \
--	cf_cv_curses_incdir="-I/usr/5include"
-+	if test "x$cf_cv_screen" = "xcurses_5lib"
-+	then
-+		test -d /usr/5lib && \
-+		test -d /usr/5include && \
-+		cf_cv_curses_incdir="-I/usr/5include"
-+	fi
- 	;;
- esac
- ])
-@@ -558,7 +643,7 @@
- CF_TERM_HEADER
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32
-+dnl CF_CURSES_FUNCS version: 17 updated: 2011/05/14 16:07:29
- dnl ---------------
- dnl Curses-functions are a little complicated, since a lot of them are macros.
- AC_DEFUN([CF_CURSES_FUNCS],
-@@ -566,6 +651,7 @@
- AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
- AC_REQUIRE([CF_XOPEN_CURSES])
- AC_REQUIRE([CF_CURSES_TERM_H])
-+AC_REQUIRE([CF_CURSES_UNCTRL_H])
- for cf_func in $1
- do
- 	CF_UPPER(cf_tr_func,$cf_func)
-@@ -578,7 +664,8 @@
- 			[
- #ifndef ${cf_func}
- long foo = (long)(&${cf_func});
--${cf_cv_main_return:-return}(foo == 0);
-+if (foo + 1234 > 5678)
-+	${cf_cv_main_return:-return}(foo);
- #endif
- 			],
- 			[cf_result=yes],
-@@ -595,7 +682,7 @@
- done
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
-+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.
-@@ -605,10 +692,10 @@
- AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
- cf_cv_ncurses_header=none
- for cf_header in ifelse($1,,,[ \
--    $1/curses.h \
--	$1/ncurses.h]) \
--	curses.h \
--	ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h])
-+    $1/ncurses.h \
-+	$1/curses.h]) \
-+	ncurses.h \
-+	curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h])
- do
- AC_TRY_COMPILE([#include <${cf_header}>],
- 	[initscr(); tgoto("?", 0,0)],
-@@ -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: 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 +731,23 @@
-     AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
-     ;;
- hpux10.*) #(vi
--    AC_CHECK_LIB(cur_colr,initscr,[
--        CF_ADD_LIBS(-lcur_colr)
--        ac_cv_func_initscr=yes
--        ],[
--    AC_CHECK_LIB(Hcurses,initscr,[
--        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
--        CF_ADD_LIBS(-lHcurses)
--        CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
--        ac_cv_func_initscr=yes
--        ])])
-+	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
-+	# next (1998), and xcurses "newer" (2000).  There is no header file for
-+	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
-+	# term.h) for cur_colr
-+	if test "x$cf_cv_screen" = "xcurses_colr"
-+	then
-+		AC_CHECK_LIB(cur_colr,initscr,[
-+			CF_ADD_LIBS(-lcur_colr)
-+			ac_cv_func_initscr=yes
-+			],[
-+		AC_CHECK_LIB(Hcurses,initscr,[
-+			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-+			CF_ADD_LIBS(-lHcurses)
-+			CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
-+			ac_cv_func_initscr=yes
-+			])])
-+	fi
-     ;;
- linux*)
- 	case `arch 2>/dev/null` in
-@@ -671,9 +765,12 @@
- 	esac
-     ;;
- sunos3*|sunos4*)
--    if test -d /usr/5lib ; then
--      CF_ADD_LIBDIR(/usr/5lib)
--      CF_ADD_LIBS(-lcurses -ltermcap)
-+	if test "x$cf_cv_screen" = "xcurses_5lib"
-+	then
-+		if test -d /usr/5lib ; then
-+			CF_ADD_LIBDIR(/usr/5lib)
-+			CF_ADD_LIBS(-lcurses -ltermcap)
-+		fi
-     fi
-     ac_cv_func_initscr=yes
-     ;;
-@@ -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 tinfo termlib unknown
-         do
-             AC_CHECK_LIB($cf_term_lib,tgoto,[break])
-         done
-@@ -738,7 +835,7 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49
-+dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55
- dnl ----------------
- dnl SVr4 curses should have term.h as well (where it puts the definitions of
- dnl the low-level interface).  This may not be true in old/broken implementations,
-@@ -752,9 +849,17 @@
- 
- # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
- # for <term.h> if we do not find the variant.
--for cf_header in \
--	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
--	term.h
-+
-+cf_header_list="term.h ncurses/term.h ncursesw/term.h"
-+
-+case ${cf_cv_ncurses_header:-curses.h} in #(vi
-+*/*)
-+	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
-+	cf_header_list="$cf_header_item $cf_header_list"
-+	;;
-+esac
-+
-+for cf_header in $cf_header_list
- do
- 	AC_TRY_COMPILE([
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -800,6 +905,61 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55
-+dnl ------------------
-+dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
-+dnl may put it in a subdirectory (along with ncurses' other headers, of
-+dnl course).  Packages which put the headers in inconsistent locations are
-+dnl broken).
-+AC_DEFUN([CF_CURSES_UNCTRL_H],
-+[
-+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
-+
-+AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[
-+
-+# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look
-+# for <unctrl.h> if we do not find the variant.
-+
-+cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
-+
-+case ${cf_cv_ncurses_header:-curses.h} in #(vi
-+*/*)
-+	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
-+	cf_header_list="$cf_header_item $cf_header_list"
-+	;;
-+esac
-+
-+for cf_header in $cf_header_list
-+do
-+	AC_TRY_COMPILE([
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#include <${cf_header}>],
-+	[WINDOW *x],
-+	[cf_cv_unctrl_header=$cf_header
-+	 break],
-+	[cf_cv_unctrl_header=no])
-+done
-+
-+case $cf_cv_unctrl_header in #(vi
-+no)
-+	AC_MSG_WARN(unctrl.h header not found)
-+	;;
-+esac
-+])
-+
-+case $cf_cv_unctrl_header in #(vi
-+unctrl.h) #(vi
-+	AC_DEFINE(HAVE_UNCTRL_H)
-+	;;
-+ncurses/unctrl.h) #(vi
-+	AC_DEFINE(HAVE_NCURSES_UNCTRL_H)
-+	;;
-+ncursesw/unctrl.h)
-+	AC_DEFINE(HAVE_NCURSESW_UNCTRL_H)
-+	;;
-+esac
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
- dnl ------------------
- dnl Check for likely values of wacs_map[].
-@@ -922,6 +1082,25 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
-+dnl ---------------------
-+dnl The rpath-hack makes it simpler to build programs, particularly with the
-+dnl *BSD ports which may have essential libraries in unusual places.  But it
-+dnl can interfere with building an executable for the base system.  Use this
-+dnl option in that case.
-+AC_DEFUN([CF_DISABLE_RPATH_HACK],
-+[
-+AC_MSG_CHECKING(if rpath-hack should be disabled)
-+CF_ARG_DISABLE(rpath-hack,
-+	[  --disable-rpath-hack    don't add rpath options for additional libraries],
-+	[cf_disable_rpath_hack=yes],
-+	[cf_disable_rpath_hack=no])
-+AC_MSG_RESULT($cf_disable_rpath_hack)
-+if test "$cf_disable_rpath_hack" = no ; then
-+	CF_RPATH_HACK
-+fi
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_ENABLE_WARNINGS version: 4 updated: 2009/07/26 17:53:03
- dnl ------------------
- dnl Configure-option to enable gcc warnings
-@@ -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
- dnl ---------------------------------------------------------------------------
-+dnl CF_GETOPT_HEADER version: 4 updated: 2009/08/31 20:07:52
-+dnl ----------------
-+dnl Check for getopt's variables which are commonly defined in stdlib.h,
-+dnl unistd.h or (nonstandard) in getopt.h
-+AC_DEFUN([CF_GETOPT_HEADER],
-+[
-+AC_HAVE_HEADERS(unistd.h getopt.h)
-+AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
-+cf_cv_getopt_header=none
-+for cf_header in stdio.h stdlib.h unistd.h getopt.h
-+do
-+AC_TRY_COMPILE([
-+#include <$cf_header>],
-+[int x = optind; char *y = optarg],
-+[cf_cv_getopt_header=$cf_header
-+ break])
-+done
-+])
-+if test $cf_cv_getopt_header != none ; then
-+	AC_DEFINE(HAVE_GETOPT_HEADER)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
- dnl -------------
- dnl Check if we must define _GNU_SOURCE to get a reasonable value for
-@@ -1498,6 +1708,60 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
-+dnl ---------------
-+dnl For the given system and compiler, find the compiler flags to pass to the
-+dnl loader to use the "rpath" feature.
-+AC_DEFUN([CF_LD_RPATH_OPT],
-+[
-+AC_REQUIRE([CF_CHECK_CACHE])
-+
-+LD_RPATH_OPT=
-+AC_MSG_CHECKING(for an rpath option)
-+case $cf_cv_system_name in #(vi
-+irix*) #(vi
-+	if test "$GCC" = yes; then
-+		LD_RPATH_OPT="-Wl,-rpath,"
-+	else
-+		LD_RPATH_OPT="-rpath "
-+	fi
-+	;;
-+linux*|gnu*|k*bsd*-gnu) #(vi
-+	LD_RPATH_OPT="-Wl,-rpath,"
-+	;;
-+openbsd[[2-9]].*|mirbsd*) #(vi
-+	LD_RPATH_OPT="-Wl,-rpath,"
-+	;;
-+dragonfly*|freebsd*) #(vi
-+	LD_RPATH_OPT="-rpath "
-+	;;
-+netbsd*) #(vi
-+	LD_RPATH_OPT="-Wl,-rpath,"
-+	;;
-+osf*|mls+*) #(vi
-+	LD_RPATH_OPT="-rpath "
-+	;;
-+solaris2*) #(vi
-+	LD_RPATH_OPT="-R"
-+	;;
-+*)
-+	;;
-+esac
-+AC_MSG_RESULT($LD_RPATH_OPT)
-+
-+case "x$LD_RPATH_OPT" in #(vi
-+x-R*)
-+	AC_MSG_CHECKING(if we need a space after rpath option)
-+	cf_save_LIBS="$LIBS"
-+	CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
-+	AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
-+	LIBS="$cf_save_LIBS"
-+	AC_MSG_RESULT($cf_rpath_space)
-+	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
-+	;;
-+esac
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_LIBRARY_PATH version: 9 updated: 2010/03/28 12:52:50
- dnl ---------------
- dnl Construct a search-list of directories for a nonstandard library-file
-@@ -1690,7 +1954,7 @@
- 	,[$1=no])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30
-+dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05
- dnl -----------------
- dnl Tie together the configure-script macros for ncurses.
- dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-@@ -1702,7 +1966,10 @@
- cf_ncuconfig_root=ifelse($1,,ncurses,$1)
- 
- echo "Looking for ${cf_ncuconfig_root}-config"
--AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none)
-+
-+CF_ACVERSION_CHECK(2.52,
-+	[AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)],
-+	[AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)])
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
-@@ -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
- dnl ---------------------------------------------------------------------------
--dnl CF_PDCURSES_X11 version: 11 updated: 2011/01/15 18:45:38
-+dnl CF_PDCURSES_X11 version: 12 updated: 2011/11/26 15:42:05
- dnl ---------------
- dnl Configure for PDCurses' X11 library
- AC_DEFUN([CF_PDCURSES_X11],[
- AC_REQUIRE([CF_X_ATHENA])
- 
--AC_PATH_PROGS(XCURSES_CONFIG,xcurses-config,none)
-+CF_ACVERSION_CHECK(2.52,
-+	[AC_CHECK_TOOLS(XCURSES_CONFIG, xcurses-config, none)],
-+	[AC_PATH_PROGS(XCURSES_CONFIG, xcurses-config, none)])
- 
- if test "$XCURSES_CONFIG" != none ; then
- 
-@@ -2176,7 +2445,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24
-+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
- dnl -------------
- dnl Check for the package-config program, unless disabled by command-line.
- AC_DEFUN([CF_PKG_CONFIG],
-@@ -2193,7 +2462,9 @@
- 	PKG_CONFIG=none
- 	;;
- yes) #(vi
--	AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)
-+	CF_ACVERSION_CHECK(2.52,
-+		[AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
-+		[AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
- 	;;
- *)
- 	PKG_CONFIG=$withval
-@@ -2373,6 +2644,121 @@
- 		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
-+dnl -------------
-+AC_DEFUN([CF_RPATH_HACK],
-+[
-+AC_REQUIRE([CF_LD_RPATH_OPT])
-+AC_MSG_CHECKING(for updated LDFLAGS)
-+if test -n "$LD_RPATH_OPT" ; then
-+	AC_MSG_RESULT(maybe)
-+
-+	AC_CHECK_PROGS(cf_ldd_prog,ldd,no)
-+	cf_rpath_list="/usr/lib /lib"
-+	if test "$cf_ldd_prog" != no
-+	then
-+		cf_rpath_oops=
-+
-+AC_TRY_LINK([#include <stdio.h>],
-+		[printf("Hello");],
-+		[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`])
-+
-+		# If we passed the link-test, but get a "not found" on a given library,
-+		# this could be due to inept reconfiguration of gcc to make it only
-+		# partly honor /usr/local/lib (or whatever).  Sometimes this behavior
-+		# is intentional, e.g., installing gcc in /usr/bin and suppressing the
-+		# /usr/local libraries.
-+		if test -n "$cf_rpath_oops"
-+		then
-+			for cf_rpath_src in $cf_rpath_oops
-+			do
-+				for cf_rpath_dir in \
-+					/usr/local \
-+					/usr/pkg \
-+					/opt/sfw
-+				do
-+					if test -f $cf_rpath_dir/lib/$cf_rpath_src
-+					then
-+						CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
-+						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
-+						break
-+					fi
-+				done
-+			done
-+		fi
-+	fi
-+
-+	CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-+
-+	CF_RPATH_HACK_2(LDFLAGS)
-+	CF_RPATH_HACK_2(LIBS)
-+
-+	CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-+fi
-+AC_SUBST(EXTRA_LDFLAGS)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_RPATH_HACK_2 version: 6 updated: 2010/04/17 16:31:24
-+dnl ---------------
-+dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
-+dnl EXTRA_LDFLAGS for each -L option found.
-+dnl
-+dnl $cf_rpath_list contains a list of directories to ignore.
-+dnl
-+dnl $1 = variable name to update.  The LDFLAGS variable should be the only one,
-+dnl      but LIBS often has misplaced -L options.
-+AC_DEFUN([CF_RPATH_HACK_2],
-+[
-+CF_VERBOSE(...checking $1 [$]$1)
-+
-+cf_rpath_dst=
-+for cf_rpath_src in [$]$1
-+do
-+	case $cf_rpath_src in #(vi
-+	-L*) #(vi
-+
-+		# check if this refers to a directory which we will ignore
-+		cf_rpath_skip=no
-+		if test -n "$cf_rpath_list"
-+		then
-+			for cf_rpath_item in $cf_rpath_list
-+			do
-+				if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
-+				then
-+					cf_rpath_skip=yes
-+					break
-+				fi
-+			done
-+		fi
-+
-+		if test "$cf_rpath_skip" = no
-+		then
-+			# transform the option
-+			if test "$LD_RPATH_OPT" = "-R " ; then
-+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"`
-+			else
-+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"`
-+			fi
-+
-+			# if we have not already added this, add it now
-+			cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
-+			if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
-+			then
-+				CF_VERBOSE(...Filter $cf_rpath_src ->$cf_rpath_tmp)
-+				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-+			fi
-+		fi
-+		;;
-+	esac
-+	cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-+done
-+$1=$cf_rpath_dst
-+
-+CF_VERBOSE(...checked $1 [$]$1)
-+AC_SUBST(EXTRA_LDFLAGS)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
- dnl ---------------
- dnl signal handler, but there are some gcc depedencies in that recommendation.
-@@ -2495,6 +2881,59 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_TOP_BUILDDIR version: 1 updated: 2006/10/15 16:33:23
-+dnl ---------------
-+dnl Define a top_builddir symbol, for applications that need an absolute path.
-+AC_DEFUN([CF_TOP_BUILDDIR],
-+[
-+top_builddir=`pwd`
-+AC_SUBST(top_builddir)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_TPUTS_PROTO version: 2 updated: 2011/04/23 19:25:50
-+dnl --------------
-+dnl Check for type of function-pointer passed to tputs.  Some old
-+dnl implementations used functions that had different prototypes, making it
-+dnl hard to compile portable programs using tputs.
-+AC_DEFUN([CF_TPUTS_PROTO],[
-+CF_CURSES_FUNCS(tputs)
-+if test x$cf_cv_func_tputs = xyes
-+then
-+	cf_done=no
-+	for cf_arg in int char
-+	do
-+		for cf_ret in int void
-+		do
-+			if test $cf_ret = void
-+			then
-+				cf_return="/* nothing */"
-+			else
-+				cf_return="return value"
-+			fi
-+			AC_TRY_COMPILE([
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#include <$cf_cv_term_header>
-+
-+static $cf_ret outc($cf_arg value) { $cf_return; }
-+],[
-+	tputs("hello", 0, outc); 
-+	${cf_cv_main_return:-return}(0);
-+],[
-+		CF_VERBOSE([prototype $cf_ret func($cf_arg value)])
-+		cat >>confdefs.h <<EOF
-+#define TPUTS_ARG               $cf_arg
-+#define TPUTS_PROTO(func,value) $cf_ret func(TPUTS_ARG value)
-+#define TPUTS_RETURN(value)     $cf_return
-+EOF
-+		cf_done=yes
-+		break
-+])
-+		done
-+		test $cf_done = yes && break
-+	done
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30
- dnl -----------------
- dnl This is a simple wrapper to use for pkg-config, for libraries which may be
-@@ -2520,6 +2959,45 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
-+dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50
-+dnl -------------------
-+dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
-+dnl can define it successfully.
-+AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
-+AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-+	AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+],[
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_cv_xopen_source=no],
-+	[cf_save="$CPPFLAGS"
-+	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+	 AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+],[
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_cv_xopen_source=no],
-+	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
-+	CPPFLAGS="$cf_save"
-+	])
-+])
-+
-+if test "$cf_cv_xopen_source" != no ; then
-+	CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
-+	CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
-+	cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+	CF_ADD_CFLAGS($cf_temp_xopen_source)
-+fi
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
- dnl --------
- dnl Make an uppercase version of a variable
-@@ -2667,6 +3145,60 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_NCURSES_ETC version: 2 updated: 2012/01/13 10:49:00
-+dnl -------------------
-+dnl Use this macro for programs which use any variant of "curses", e.g.,
-+dnl "ncurses", and "PDCurses".  Programs that can use curses and some unrelated
-+dnl library (such as slang) should use a "--with-screen=XXX" option.
-+dnl
-+dnl This does not use AC_DEFUN, because that would tell autoconf to run each
-+dnl of the macros inside this one - before this macro.
-+define([CF_WITH_NCURSES_ETC],[
-+CF_WITH_CURSES_DIR
-+
-+cf_cv_screen=curses
-+
-+AC_MSG_CHECKING(for specified curses library type)
-+AC_ARG_WITH(ncursesw,
-+	[  --with-ncursesw         use wide ncurses-libraries],
-+	[cf_cv_screen=ncursesw],[
-+
-+AC_ARG_WITH(ncurses,
-+	[  --with-ncurses          use ncurses-libraries],
-+	[cf_cv_screen=ncurses],[
-+
-+AC_ARG_WITH(pdcurses,
-+	[  --with-pdcurses         compile/link with pdcurses X11 library],
-+	[cf_cv_screen=pdcurses],[
-+
-+AC_ARG_WITH(curses-colr,
-+	[  --with-curses-colr      compile/link with HPUX 10.x color-curses],
-+	[cf_cv_screen=curses_colr],[
-+
-+AC_ARG_WITH(curses-5lib,
-+	[  --with-curses-5lib      compile/link with SunOS 5lib curses],
-+	[cf_cv_screen=curses_5lib])])])])])
-+
-+AC_MSG_RESULT($cf_cv_screen)
-+
-+case $cf_cv_screen in #(vi
-+curses|curses_*) #(vi
-+	CF_CURSES_CONFIG
-+	;;
-+ncurses) #(vi
-+	CF_NCURSES_CONFIG
-+	;;
-+ncursesw) #(vi
-+	CF_UTF8_LIB
-+	CF_NCURSES_CONFIG(ncursesw)
-+	;;
-+pdcurses)
-+	CF_PDCURSES_X11
-+	;;
-+esac
-+
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
- dnl ----------------
- AC_DEFUN([CF_WITH_VALGRIND],[
-@@ -2714,7 +3246,7 @@
- test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
-+dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -2730,7 +3262,7 @@
- cf_xopen_source=
- 
- case $host_os in #(vi
--aix[[456]]*) #(vi
-+aix[[4-7]]*) #(vi
- 	cf_xopen_source="-D_ALL_SOURCE"
- 	;;
- cygwin) #(vi
-@@ -2741,6 +3273,7 @@
- 	;;
- darwin*) #(vi
- 	cf_xopen_source="-D_DARWIN_C_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- freebsd*|dragonfly*) #(vi
- 	# 5.x headers associate
-@@ -2758,15 +3291,23 @@
- 	;;
- irix[[56]].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
--	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
-+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
-+	cf_XOPEN_SOURCE=
-+	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
- 	;;
- netbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	;;
-+openbsd[[4-9]]*) #(vi
-+	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
-+	cf_xopen_source="-D_BSD_SOURCE"
-+	cf_XOPEN_SOURCE=600
- 	;;
- openbsd*) #(vi
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -2780,36 +3321,11 @@
- sco*) #(vi
- 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
- 	;;
--solaris2.1[[0-9]]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	;;
--solaris2.[[1-9]]) #(vi
-+solaris2.*) #(vi
- 	cf_xopen_source="-D__EXTENSIONS__"
- 	;;
- *)
--	AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
--	AC_TRY_COMPILE([#include <sys/types.h>],[
--#ifndef _XOPEN_SOURCE
--make an error
--#endif],
--	[cf_cv_xopen_source=no],
--	[cf_save="$CPPFLAGS"
--	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	 AC_TRY_COMPILE([#include <sys/types.h>],[
--#ifdef _XOPEN_SOURCE
--make an error
--#endif],
--	[cf_cv_xopen_source=no],
--	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
--	CPPFLAGS="$cf_save"
--	])
--])
--	if test "$cf_cv_xopen_source" != no ; then
--		CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
--		CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
--		cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
--		CF_ADD_CFLAGS($cf_temp_xopen_source)
--	fi
-+	CF_TRY_XOPEN_SOURCE
- 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
- 	;;
- esac
-@@ -2817,6 +3333,35 @@
- if test -n "$cf_xopen_source" ; then
- 	CF_ADD_CFLAGS($cf_xopen_source)
- fi
-+
-+dnl In anything but the default case, we may have system-specific setting
-+dnl which is still not guaranteed to provide all of the entrypoints that
-+dnl _XOPEN_SOURCE would yield.
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+	AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
-+	AC_TRY_COMPILE([#include <stdlib.h>],[
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif],
-+	[cf_XOPEN_SOURCE_set=yes],
-+	[cf_XOPEN_SOURCE_set=no])
-+	AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
-+	if test $cf_XOPEN_SOURCE_set = yes
-+	then
-+		AC_TRY_COMPILE([#include <stdlib.h>],[
-+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-+make an error
-+#endif],
-+		[cf_XOPEN_SOURCE_set_ok=yes],
-+		[cf_XOPEN_SOURCE_set_ok=no])
-+		if test $cf_XOPEN_SOURCE_set_ok = no
-+		then
-+			AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
-+		fi
-+	else
-+		CF_TRY_XOPEN_SOURCE
-+	fi
-+fi
- ])
- dnl ---------------------------------------------------------------------------
- dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
-@@ -2957,7 +3502,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33
-+dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02
- dnl ----------------
- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
- dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
-@@ -2973,19 +3518,24 @@
- 	/usr/local
- do
- 	for cf_lib in \
--		"-l$cf_x_athena_root -lXmu" \
--		"-l$cf_x_athena_root -lXpm -lXmu" \
--		"-l${cf_x_athena_root}_s -lXmu_s"
-+		${cf_x_athena_root} \
-+		${cf_x_athena_root}7 \
-+		${cf_x_athena_root}6
-+	do
-+	for cf_libs in \
-+		"-l$cf_lib -lXmu" \
-+		"-l$cf_lib -lXpm -lXmu" \
-+		"-l${cf_lib}_s -lXmu_s"
- 	do
- 		if test -z "$cf_x_athena_lib" ; then
- 			cf_save="$LIBS"
- 			cf_test=XawSimpleMenuAddGlobalActions
- 			if test $cf_path != default ; then
--				CF_ADD_LIBS(-L$cf_path/lib $cf_lib)
--				AC_MSG_CHECKING(for $cf_lib in $cf_path)
-+				CF_ADD_LIBS(-L$cf_path/lib $cf_libs)
-+				AC_MSG_CHECKING(for $cf_libs in $cf_path)
- 			else
--				CF_ADD_LIBS($cf_lib)
--				AC_MSG_CHECKING(for $cf_test in $cf_lib)
-+				CF_ADD_LIBS($cf_libs)
-+				AC_MSG_CHECKING(for $cf_test in $cf_libs)
- 			fi
- 			AC_TRY_LINK([
- #include <X11/Intrinsic.h>
-@@ -2996,12 +3546,14 @@
- 				[cf_result=no])
- 			AC_MSG_RESULT($cf_result)
- 			if test "$cf_result" = yes ; then
--				cf_x_athena_lib="$cf_lib"
-+				cf_x_athena_lib="$cf_libs"
- 				break
- 			fi
- 			LIBS="$cf_save"
- 		fi
--	done
-+	done # cf_libs
-+		test -n "$cf_x_athena_lib" && break
-+	done # cf_lib
- done
- 
- 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-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-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,172 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: background.c,v 1.3 2006/06/03 16:43:08 tom Exp $
-+ * $Id: background.c,v 1.13 2012/06/09 20:30:33 tom Exp $
-  */
- 
--#include <test.priv.h>
-+#define NEED_COLOR_CODE 1
-+#define NEED_COLOR_NAME 1
-+#include <color_name.h>
-+
-+static int default_bg = COLOR_BLACK;
-+static int default_fg = COLOR_WHITE;
-+
-+static void
-+test_background(void)
-+{
-+    short 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((chtype) (' ' | COLOR_PAIR(1)));
-+    printw("RED/BLACK\n");
-+    getch();
-+
-+    printw("Initializing pair 2 to %s/blue\n", color_name(default_fg));
-+    init_pair(2, (short) default_fg, COLOR_BLUE);
-+    bkgdset((chtype) (' ' | COLOR_PAIR(2)));
-+    printw("This line should be %s/blue\n", color_name(default_fg));
-+    getch();
-+
-+    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((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((chtype) (' ' | COLOR_PAIR(0)));
-+    getch();
-+
-+    printw("Setting screen to pair 1\n");
-+    bkgd((chtype) (' ' | COLOR_PAIR(1)));
-+    getch();
-+
-+    printw("Setting screen to pair 2\n");
-+    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((chtype) (' ' | COLOR_PAIR(0)));
-+    getch();
-+}
-+
-+static void
-+usage(void)
-+{
-+    static const char *msg[] =
-+    {
-+	"Usage: background [options]"
-+	,""
-+	,"Options:"
-+#if HAVE_ASSUME_DEFAULT_COLORS
-+	," -a       invoke assume_default_colors, repeat to use in init_pair"
-+#endif
-+	," -b XXX   specify background color"
-+#if HAVE_USE_DEFAULT_COLORS
-+	," -d       invoke use_default_colors, repeat to use in init_pair"
-+#endif
-+	," -f XXX   specify foreground color"
-+    };
-+    size_t n;
-+
-+    for (n = 0; n < SIZEOF(msg); n++)
-+	fprintf(stderr, "%s\n", msg[n]);
-+
-+    ExitProgram(EXIT_FAILURE);
-+}
- 
- int
- main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
- {
--    short f, b;
-+#if HAVE_ASSUME_DEFAULT_COLORS
-+    int a_option = 0;
-+#endif
-+#if HAVE_USE_DEFAULT_COLORS
-+    int d_option = 0;
-+#endif
-+    int n;
-+
-+    setlocale(LC_ALL, "");
-+
-+    while ((n = getopt(argc, argv, "ab:df:")) != -1) {
-+	switch (n) {
-+#if HAVE_ASSUME_DEFAULT_COLORS
-+	case 'a':
-+	    ++a_option;
-+	    break;
-+#endif
-+	case 'b':
-+	    default_bg = color_code(optarg);
-+	    break;
-+#if HAVE_USE_DEFAULT_COLORS
-+	case 'd':
-+	    ++d_option;
-+	    break;
-+#endif
-+	case 'f':
-+	    default_fg = color_code(optarg);
-+	    break;
-+	default:
-+	    usage();
-+	}
-+    }
-+#if HAVE_USE_DEFAULT_COLORS && HAVE_ASSUME_DEFAULT_COLORS
-+    if (a_option && d_option) {
-+	fprintf(stderr, "Use either -a or -d option, but not both\n");
-+	ExitProgram(EXIT_FAILURE);
-+    }
-+#endif
- 
-     initscr();
-     cbreak();
-@@ -43,47 +200,30 @@
-     if (has_colors()) {
- 	start_color();
- 
--	pair_content(0, &f, &b);
--	printw("pair 0 contains (%d,%d)\n", f, b);
--	getch();
-+#if HAVE_USE_DEFAULT_COLORS
-+	if (d_option) {
-+	    printw("Using default colors...\n");
-+	    use_default_colors();
-+	    if (d_option > 1) {
-+		default_fg = -1;
-+		default_bg = -1;
-+	    }
-+	}
-+#endif
-+#if HAVE_ASSUME_DEFAULT_COLORS
-+	if (a_option) {
-+	    printw("Using assumed colors %s/%s...\n",
-+		   color_name(default_fg),
-+		   color_name(default_bg));
-+	    assume_default_colors(default_fg, default_bg);
-+	    if (a_option > 1) {
-+		default_fg = -1;
-+		default_bg = -1;
-+	    }
-+	}
-+#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));
--	getch();
--
--	printw("Setting screen to pair 1\n");
--	bkgd(' ' | COLOR_PAIR(1));
--	getch();
--
--	printw("Setting screen to pair 2\n");
--	bkgd(' ' | COLOR_PAIR(2));
--	getch();
--
--	printw("Setting screen to pair 0\n");
--	bkgd(' ' | COLOR_PAIR(0));
--	getch();
-+	test_background();
- 
-     } 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-08-25 19:58:00.066564462 +0000
-@@ -0,0 +1,103 @@
-+/****************************************************************************
-+ * Copyright (c) 2011 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.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: color_name.h,v 1.3 2011/05/14 17:41:17 tom Exp $
-+ */
-+
-+#ifndef __COLORNAME_H
-+#define __COLORNAME_H 1
-+
-+#ifndef __TEST_PRIV_H
-+#include <test.priv.h>
-+#endif
-+
-+static NCURSES_CONST char *the_color_names[] =
-+{
-+    "black",
-+    "red",
-+    "green",
-+    "yellow",
-+    "blue",
-+    "magenta",
-+    "cyan",
-+    "white",
-+    "BLACK",
-+    "RED",
-+    "GREEN",
-+    "YELLOW",
-+    "BLUE",
-+    "MAGENTA",
-+    "CYAN",
-+    "WHITE"
-+};
-+
-+#ifdef NEED_COLOR_CODE
-+static int
-+color_code(const char *color)
-+{
-+    int result = 0;
-+    char *endp = 0;
-+    size_t n;
-+
-+    if ((result = (int) strtol(color, &endp, 0)) >= 0
-+	&& (endp == 0 || *endp == 0)) {
-+	;
-+    } else if (!strcmp(color, "default")) {
-+	result = -1;
-+    } else {
-+	for (n = 0; n < SIZEOF(the_color_names); ++n) {
-+	    if (!strcmp(the_color_names[n], color)) {
-+		result = (int) n;
-+		break;
-+	    }
-+	}
-+    }
-+    return result;
-+}
-+#endif /* NEED_COLOR_NAME */
-+
-+#ifdef NEED_COLOR_NAME
-+static const char *
-+color_name(int color)
-+{
-+    static char temp[20];
-+    const char *result = 0;
-+
-+    if (color > (int) SIZEOF(the_color_names)) {
-+	sprintf(temp, "%d", color);
-+	result = temp;
-+    } else if (color < 0) {
-+	result = "default";
-+    } else {
-+	result = the_color_names[color];
-+    }
-+    return result;
-+}
-+#endif /* NEED_COLOR_NAME */
-+
-+#endif /* __COLORNAME_H */
-diff -Naur ncurses-5.9.orig/test/configure ncurses-5.9/test/configure
---- 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}
- 
- ac_unique_file="ncurses.c"
--# Factoring default headers for most tests.
--ac_includes_default="\
--#include <stdio.h>
--#if HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#if HAVE_SYS_STAT_H
--# include <sys/stat.h>
--#endif
--#if STDC_HEADERS
--# include <stdlib.h>
--# include <stddef.h>
--#else
--# if HAVE_STDLIB_H
--#  include <stdlib.h>
--# endif
--#endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
--#  include <memory.h>
--# endif
--# include <string.h>
--#endif
--#if HAVE_STRINGS_H
--# include <strings.h>
--#endif
--#if HAVE_INTTYPES_H
--# include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
--#endif
--#if HAVE_UNISTD_H
--# include <unistd.h>
--#endif"
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -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
-   --disable-leaks         test: free permanent memory, analyze leaks
-+  --disable-widec           disable checks for wide-character functions
-   --with-curses-dir=DIR   directory in which (n)curses is installed
--  --with-5lib             use SunOS sysv-libraries
--  --with-ncursesw         use wide ncurses-libraries (installed)
--  --with-ncurses          use ncurses-libraries (installed)
-+  --with-ncursesw         use wide ncurses-libraries
-+  --with-ncurses          use ncurses-libraries
-   --with-pdcurses         compile/link with pdcurses X11 library
-+  --with-curses-colr      compile/link with HPUX 10.x color-curses
-+  --with-curses-5lib      compile/link with SunOS 5lib curses
-   --with-Xaw3d            link with Xaw 3d library
-   --with-neXtaw           link with neXT Athena library
-   --with-XawPlus          link with Athena-Plus library
-   --with-pkg-config{=path} enable/disable use of pkg-config
-   --with-x                use the X Window System
-   --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables
-+  --disable-rpath-hack    don't add rpath options for additional libraries
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -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: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 +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:881: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -910,7 +886,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:913: 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 +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: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: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=: ;;
-     ,);;
-     *)
-       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: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: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:919:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -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: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: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 +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:961: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:988: \$? = $ac_status" >&5
-+  echo "$as_me:964: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -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: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 +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: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: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 +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: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: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; }; }
- 
- fi
--echo "$as_me:1052: 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 +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: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 +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: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; }; }
- 
- fi
--echo "$as_me:1074: 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 +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: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: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: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 +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: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 +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:1119: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:1147: result: no" >&5
-+  echo "$as_me:1123: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -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: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 +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:1152: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1160: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1187: result: no" >&5
-+  echo "$as_me:1163: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1187: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1195: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1222: result: no" >&5
-+  echo "$as_me:1198: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1226: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1234: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1261: result: no" >&5
-+  echo "$as_me:1237: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1261: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1269: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1296: result: no" >&5
-+  echo "$as_me:1272: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +1302,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
--echo "$as_me:1329: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1305: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1327: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1354: result: no" >&5
-+  echo "$as_me:1330: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1356: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1364: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1391: result: no" >&5
-+  echo "$as_me:1367: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:1395: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:1403: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1430: result: no" >&5
-+  echo "$as_me:1406: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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:1418: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1447:" \
-+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: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:1429: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1455: \"$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:1434: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1460: \"$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:1439: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1467 "configure"
-+#line 1443 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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: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:1462: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1489: \$? = $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 +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:1488: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1518: result: $ac_file" >&5
-+echo "$as_me:1494: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1523: 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
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1529: \"$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:1508: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1539: 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 +1520,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1547: result: yes" >&5
-+echo "$as_me:1523: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1554: 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:1532: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1559: 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:1537: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1564: \$? = $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 +1553,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1580: 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; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1586: result: $ac_cv_exeext" >&5
-+echo "$as_me:1562: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1592: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1598 "configure"
-+#line 1574 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:1586: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1613: \$? = $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 +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:1601: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1632: 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1642 "configure"
-+#line 1618 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1654,16 +1630,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1657: \"$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: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:1639: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1666: \$? = $ac_status" >&5
-+  echo "$as_me:1642: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -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: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`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1684: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1690 "configure"
-+#line 1666 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1699,16 +1675,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1702: \"$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: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:1684: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1711: \$? = $ac_status" >&5
-+  echo "$as_me:1687: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -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: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 +1721,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1748: \"$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: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:1730: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1757: \$? = $ac_status" >&5
-+  echo "$as_me:1733: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -1766,7 +1742,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1769 "configure"
-+#line 1745 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -1779,16 +1755,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1782: \"$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: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:1764: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1791: \$? = $ac_status" >&5
-+  echo "$as_me:1767: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -1798,7 +1774,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1801 "configure"
-+#line 1777 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -1810,16 +1786,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1813: \"$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: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:1795: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1822: \$? = $ac_status" >&5
-+  echo "$as_me:1798: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -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: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 +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 1853 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1882: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1888: \$? = $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 +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 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:1891: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1921: \$? = $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 +1931,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:1958: 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 +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 1944 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1973: \"$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=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1979: \$? = $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 +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 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:1982: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2012: \$? = $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 +2013,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2040: 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 +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: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 +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:2047: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2055: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:2082: result: no" >&5
-+  echo "$as_me:2058: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +2123,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:2150: 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 +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: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 +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:2166: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2174: result: $LINT" >&5
- echo "${ECHO_T}$LINT" >&6
- else
--  echo "$as_me:2201: result: no" >&5
-+  echo "$as_me:2177: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$LINT" && break
- done
- 
--echo "$as_me:2208: 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 +2208,7 @@
- fi
- 
- fi
--echo "$as_me:2235: 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 +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: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 +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:2236: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2244: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:2271: result: no" >&5
-+  echo "$as_me:2247: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:2273: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2281: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:2308: result: no" >&5
-+  echo "$as_me:2284: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:2308: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2317: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:2344: result: no" >&5
-+  echo "$as_me:2320: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:2351: 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 +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:2342: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -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:2351: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:2378: result: no" >&5
-+  echo "$as_me:2354: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2395,14 +2371,14 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:2398: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 2405 "configure"
-+#line 2381 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -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:2396: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:2423: \$? = $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:2402: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2429: \$? = $ac_status" >&5
-+  echo "$as_me:2405: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -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:2415: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
- MATH_LIB=-lm
- fi
- 
-+top_builddir=`pwd`
-+
- CC_G_OPT="-g"
- CC_SHARED_OPTS=unknown
- CPPFLAGS="$CPPFLAGS"
-@@ -2464,14 +2442,118 @@
- TEST_ARGS=""
- TEST_DEPS=""
- TEST_LIBS=""
--TINFO_ARGS='$(LIBS_CURSES)'
-+TINFO_LDFLAGS=''
-+TINFO_LIBS='$(LIBS_CURSES)'
- cf_cv_abi_version=""
- cf_cv_rel_version=""
- 
- cf_cv_screen=curses
- cf_cv_libtype=
- 
--echo "$as_me:2474: checking for ${CC:-cc} option to accept ANSI C" >&5
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+# 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:2459: checking \$CC variable" >&5
-+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
-+case "$CC" in #(vi
-+*[\ \	]-[IUD]*)
-+	echo "$as_me:2463: result: broken" >&5
-+echo "${ECHO_T}broken" >&6
-+	{ 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...
-+	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-+	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+for cf_add_cflags in $cf_flags
-+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
-+
-+	;;
-+*)
-+	echo "$as_me:2551: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+	;;
-+esac
-+
-+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 +2657,7 @@
- fi
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 2578 "configure"
-+#line 2660 "configure"
- #include "confdefs.h"
- 
- #ifndef CC_HAS_PROTOS
-@@ -2596,16 +2678,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2599: \"$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: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:2687: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2608: \$? = $ac_status" >&5
-+  echo "$as_me:2690: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ansi_cc="$cf_arg"; break
- else
-@@ -2618,7 +2700,7 @@
- CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:2621: 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 +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: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 +2824,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:2745: 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 2830 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -2794,12 +2876,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:2797: \"$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: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:2884: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in #(vi
-@@ -2839,7 +2921,7 @@
- cf_xopen_source=
- 
- case $host_os in #(vi
--aix[456]*) #(vi
-+aix[4-7]*) #(vi
- 	cf_xopen_source="-D_ALL_SOURCE"
- 	;;
- cygwin) #(vi
-@@ -2850,6 +2932,7 @@
- 	;;
- darwin*) #(vi
- 	cf_xopen_source="-D_DARWIN_C_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- freebsd*|dragonfly*) #(vi
- 	# 5.x headers associate
-@@ -2867,17 +2950,18 @@
- 	;;
- irix[56].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
-+	cf_XOPEN_SOURCE=
- 	;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 
--echo "$as_me:2873: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 2880 "configure"
-+#line 2964 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -2892,16 +2976,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2895: \"$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: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:2985: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2904: \$? = $ac_status" >&5
-+  echo "$as_me:2988: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -2910,7 +2994,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 2913 "configure"
-+#line 2997 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -2925,16 +3009,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2928: \"$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: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:3018: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2937: \$? = $ac_status" >&5
-+  echo "$as_me:3021: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -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: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"
- 
- 	;;
- mirbsd*) #(vi
--	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
--	;;
--netbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
--	;;
--openbsd*) #(vi
--	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
--	;;
--osf[45]*) #(vi
--	cf_xopen_source="-D_OSF_SOURCE"
--	;;
--nto-qnx*) #(vi
--	cf_xopen_source="-D_QNX_SOURCE"
--	;;
--sco*) #(vi
--	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
--	;;
--solaris2.1[0-9]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	;;
--solaris2.[1-9]) #(vi
--	cf_xopen_source="-D__EXTENSIONS__"
--	;;
--*)
--	echo "$as_me:2982: 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
-+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
-+	cf_XOPEN_SOURCE=
-+
-+cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-+
-+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'`
-+
-+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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+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 3067 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
- main ()
- {
- 
--#ifndef _XOPEN_SOURCE
-+#ifndef _POSIX_C_SOURCE
- make an error
- #endif
-   ;
-@@ -3001,32 +3079,44 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3004: \"$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: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:3088: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3013: \$? = $ac_status" >&5
-+  echo "$as_me:3091: \$? = $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
--cf_save="$CPPFLAGS"
--	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
--	 cat >conftest.$ac_ext <<_ACEOF
--#line 3022 "configure"
-+cf_want_posix_source=no
-+	 case .$cf_POSIX_C_SOURCE in #(vi
-+	 .[12]??*) #(vi
-+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
-+		;;
-+	 .2) #(vi
-+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
-+		cf_want_posix_source=yes
-+		;;
-+	 .*)
-+		cf_want_posix_source=yes
-+		;;
-+	 esac
-+	 if test "$cf_want_posix_source" = yes ; then
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 3112 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
- main ()
- {
- 
--#ifdef _XOPEN_SOURCE
-+#ifdef _POSIX_SOURCE
- make an error
- #endif
-   ;
-@@ -3034,50 +3124,87 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3037: \"$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: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:3133: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3046: \$? = $ac_status" >&5
-+  echo "$as_me:3136: \$? = $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
-+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"
-+	 fi
-+
-+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}:3152: testing if the second compile does not leave our definition intact error ..." 1>&5
-+
-+	 cat >conftest.$ac_ext <<_ACEOF
-+#line 3155 "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:3170: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3173: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3176: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3179: \$? = $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"
-+	 CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:3061: 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
-+echo "$as_me:3195: 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=
- 
--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)
-@@ -3150,33 +3277,241 @@
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
--	fi
--
--cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
--
--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
-+	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
-+	;;
-+openbsd[4-9]*) #(vi
-+	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
-+	cf_xopen_source="-D_BSD_SOURCE"
-+	cf_XOPEN_SOURCE=600
-+	;;
-+openbsd*) #(vi
-+	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-+	;;
-+osf[45]*) #(vi
-+	cf_xopen_source="-D_OSF_SOURCE"
-+	;;
-+nto-qnx*) #(vi
-+	cf_xopen_source="-D_QNX_SOURCE"
-+	;;
-+sco*) #(vi
-+	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
-+	;;
-+solaris2.*) #(vi
-+	cf_xopen_source="-D__EXTENSIONS__"
-+	;;
-+*)
- 
--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
- 
--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>
-+#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:3334: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3337: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3340: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3343: \$? = $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 3352 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3371: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3374: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3377: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3380: \$? = $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"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:3395: 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"
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+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*)
-+			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
-+
-+cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-+
-+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'`
-+
-+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
- 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:3527: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3195: \$? = $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:3533: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3201: \$? = $ac_status" >&5
-+  echo "$as_me:3536: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -3219,7 +3554,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3222 "configure"
-+#line 3557 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -3234,16 +3569,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3237: \"$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: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:3578: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3246: \$? = $ac_status" >&5
-+  echo "$as_me:3581: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:3592: 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}:3262: 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 3600 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -3277,16 +3612,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3280: \"$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: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:3621: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3289: \$? = $ac_status" >&5
-+  echo "$as_me:3624: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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: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,104 +3809,371 @@
- 
- fi
- 
--echo "$as_me:3477: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--#line 3485 "configure"
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+	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 3816 "configure"
- #include "confdefs.h"
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
-+#include <stdlib.h>
- int
- main ()
- {
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif
-   ;
-   return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5
-+rm -f conftest.$ac_objext
-+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: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:3837: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3543: \$? = $ac_status" >&5
-+  echo "$as_me:3840: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
-+  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
--done
--rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
--
--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 ;;
-+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3869: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3872: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3875: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3878: \$? = $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: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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 3901 "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:3920: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3923: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3926: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3929: \$? = $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 3938 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
-+#ifdef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3957: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3960: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3963: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:3966: \$? = $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"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:3981: 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"
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+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*)
-+			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
-+
-+	fi
-+fi
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 4087 "configure"
-+#include "confdefs.h"
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX			-qlanglvl=ansi
-+# Ultrix and OSF/1	-std1
-+# HP-UX 10.20 and later	-Ae
-+# HP-UX older versions	-Aa -D_HPUX_SOURCE
-+# SVR4			-Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4136: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:4139: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4142: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:4145: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+  x|xno)
-+    echo "$as_me:4162: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    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:4234: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3635: \$? = $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:4240: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3641: \$? = $ac_status" >&5
-+  echo "$as_me:4243: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -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: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 +4260,7 @@
- 
- fi
- 
--echo "$as_me:3661: 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 +4272,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3673 "configure"
-+#line 4275 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -3693,16 +4295,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3696: \"$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: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:4304: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3705: \$? = $ac_status" >&5
-+  echo "$as_me:4307: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -3716,13 +4318,13 @@
- 
- fi
- 
--echo "$as_me:3719: 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
- #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
- EOF
- 
--echo "$as_me:3725: 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 +4358,22 @@
-     ECHO_CC=''
- 
- fi;
--echo "$as_me:3759: result: $enableval" >&5
-+echo "$as_me:4361: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:3764: 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:4370: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
- if ( test "$GCC" = yes || test "$GXX" = yes )
- then
--echo "$as_me:3774: 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 +4390,7 @@
-   with_warnings=no
- 
- fi;
--echo "$as_me:3791: 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 +4413,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:3814: 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 4419 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -3863,12 +4465,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:3866: \"$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: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:4473: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in #(vi
-@@ -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: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"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3916 "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
- 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:4586: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3936: \$? = $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:4592: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3942: \$? = $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"
-+  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:3953: result: $INTEL_COMPILER" >&5
--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 4611 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -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: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 +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:4644: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3996: \$? = $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:4649: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -4004,7 +4655,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:4007: 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 +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:4678: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4030: \$? = $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:4683: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in #(vi
- 			Wcast-qual) #(vi
-@@ -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}: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 +4717,7 @@
- fi
- fi
- 
--echo "$as_me:4059: 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 +4733,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:4075: 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 +4827,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:4169: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4175 "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:4840: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4185: \$? = $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 +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: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: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 +4874,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4216 "configure"
-+#line 4877 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:4896: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4238: \$? = $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:4902: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4244: \$? = $ac_status" >&5
-+  echo "$as_me:4905: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -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: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 +4928,7 @@
- 
- fi
- 
--echo "$as_me:4270: 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 +4944,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:4286: 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 +5038,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:4380: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4386 "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:5051: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4396: \$? = $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 +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: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: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 +5085,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4427 "configure"
-+#line 5088 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5107: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4449: \$? = $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:5113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4455: \$? = $ac_status" >&5
-+  echo "$as_me:5116: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -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: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 +5139,7 @@
- 
- fi
- 
--echo "$as_me:4481: 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 +5155,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:4497: 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 +5248,7 @@
- 	;;
- esac
- 
--echo "$as_me:4590: 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 +5258,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:4600: 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 +5272,27 @@
- 
- fi
- 
--echo "$as_me:4614: checking for specific curses-directory" >&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
-+
-+# Check whether --enable-widec or --disable-widec was given.
-+if test "${enable_widec+set}" = set; then
-+  enableval="$enable_widec"
-+  test "$enableval" != no && enableval=yes
-+  if test "$enableval" != "yes" ; then
-+    cf_enable_widec=no
-+  else
-+    cf_enable_widec=yes
-+  fi
-+else
-+  enableval=yes
-+  cf_enable_widec=yes
-+
-+fi;
-+echo "$as_me:5292: result: $cf_enable_widec" >&5
-+echo "${ECHO_T}$cf_enable_widec" >&6
-+
-+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 +5302,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--echo "$as_me:4624: 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" )
-@@ -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:5336: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -4685,7 +5366,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4688 "configure"
-+#line 5369 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4697,16 +5378,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4700: \"$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: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:5387: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4709: \$? = $ac_status" >&5
-+  echo "$as_me:5390: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:5407: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -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}:5441: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -4768,12 +5449,10 @@
- 	fi
- fi
- 
--# Check whether --with-5lib or --without-5lib was given.
--if test "${with_5lib+set}" = set; then
--  withval="$with_5lib"
--  LIBS="-L/usr/5lib $LIBS"
--	 CPPFLAGS="$CPPFLAGS -I/usr/5include"
--fi;
-+cf_cv_screen=curses
-+
-+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 +5470,31 @@
- if test "${with_pdcurses+set}" = set; then
-   withval="$with_pdcurses"
-   cf_cv_screen=pdcurses
-+else
-+
-+# Check whether --with-curses-colr or --without-curses-colr was given.
-+if test "${with_curses_colr+set}" = set; then
-+  withval="$with_curses_colr"
-+  cf_cv_screen=curses_colr
-+else
-+
-+# Check whether --with-curses-5lib or --without-curses-5lib was given.
-+if test "${with_curses_5lib+set}" = set; then
-+  withval="$with_curses_5lib"
-+  cf_cv_screen=curses_5lib
-+fi;
-+fi;
- fi;
- fi;
- fi;
- 
--case $cf_cv_screen in
--curses)
-+echo "$as_me:5491: result: $cf_cv_screen" >&5
-+echo "${ECHO_T}$cf_cv_screen" >&6
-+
-+case $cf_cv_screen in #(vi
-+curses|curses_*) #(vi
- 
--echo "$as_me:4801: 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 +5503,28 @@
- cf_cv_curses_incdir=no
- case $host_os in #(vi
- hpux10.*) #(vi
--	test -d /usr/include/curses_colr && \
--	cf_cv_curses_incdir="-I/usr/include/curses_colr"
-+	if test "x$cf_cv_screen" = "xcurses_colr"
-+	then
-+		test -d /usr/include/curses_colr && \
-+		cf_cv_curses_incdir="-I/usr/include/curses_colr"
-+	fi
- 	;;
- sunos3*|sunos4*)
--	test -d /usr/5lib && \
--	test -d /usr/5include && \
--	cf_cv_curses_incdir="-I/usr/5include"
-+	if test "x$cf_cv_screen" = "xcurses_5lib"
-+	then
-+		test -d /usr/5lib && \
-+		test -d /usr/5include && \
-+		cf_cv_curses_incdir="-I/usr/5include"
-+	fi
- 	;;
- esac
- 
- fi
--echo "$as_me:4821: 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: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 +5532,11 @@
- 
- cf_cv_ncurses_header=none
- for cf_header in  \
--	curses.h \
--	ncurses.h ncurses/curses.h ncurses/ncurses.h
-+	ncurses.h \
-+	curses.h ncurses/ncurses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4837 "configure"
-+#line 5539 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -4846,16 +5548,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4849: \"$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: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:5557: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4858: \$? = $ac_status" >&5
-+  echo "$as_me:5560: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -4866,11 +5568,11 @@
- done
- 
- fi
--echo "$as_me:4869: 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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4889 "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:5595: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4899: \$? = $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 +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: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 +5627,7 @@
- fi
- done
- 
--echo "$as_me:4928: 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 +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 5648 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4958,16 +5660,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4961: \"$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: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:5669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4970: \$? = $ac_status" >&5
-+  echo "$as_me:5672: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -4983,7 +5685,7 @@
- done
- 
- fi
--echo "$as_me:4986: 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 +5714,7 @@
- 	;;
- esac
- 
--echo "$as_me:5015: 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 +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:5743: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5044: \$? = $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 +5753,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5054 "configure"
-+#line 5756 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5076,15 +5778,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5079: \"$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:5784: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5084: \"$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:5789: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5098,16 +5800,16 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:5101: 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
- #define NCURSES 1
- EOF
- 
--echo "$as_me:5107: 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 5812 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:5824: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5125: \$? = $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:5830: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5131: \$? = $ac_status" >&5
-+  echo "$as_me:5833: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:5842: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = no ; then
- case $host_os in #(vi
- freebsd*) #(vi
--    echo "$as_me:5146: 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 +5853,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5154 "configure"
-+#line 5856 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5875: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5176: \$? = $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:5881: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5182: \$? = $ac_status" >&5
-+  echo "$as_me:5884: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -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: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 +5900,13 @@
- 
-     ;;
- hpux10.*) #(vi
--    echo "$as_me:5201: checking for initscr in -lcur_colr" >&5
-+	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
-+	# next (1998), and xcurses "newer" (2000).  There is no header file for
-+	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
-+	# term.h) for cur_colr
-+	if test "x$cf_cv_screen" = "xcurses_colr"
-+	then
-+		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 +5914,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcur_colr  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5209 "configure"
-+#line 5917 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5936: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5231: \$? = $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:5942: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5237: \$? = $ac_status" >&5
-+  echo "$as_me:5945: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cur_colr_initscr=yes
- else
-@@ -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: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
- 
--        LIBS="-lcur_colr $LIBS"
--        ac_cv_func_initscr=yes
-+			LIBS="-lcur_colr $LIBS"
-+			ac_cv_func_initscr=yes
- 
- else
- 
--    echo "$as_me:5257: 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 +5970,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lHcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5265 "configure"
-+#line 5973 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:5992: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5287: \$? = $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:5998: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5293: \$? = $ac_status" >&5
-+  echo "$as_me:6001: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Hcurses_initscr=yes
- else
-@@ -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: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
- 
--        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
--        LIBS="-lHcurses $LIBS"
--        CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
--        ac_cv_func_initscr=yes
-+			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-+			LIBS="-lHcurses $LIBS"
-+			CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
-+			ac_cv_func_initscr=yes
- 
- fi
- 
- fi
- 
-+	fi
-     ;;
- linux*)
- 	case `arch 2>/dev/null` in
-@@ -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}:6052: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -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}:6081: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -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}:6112: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -5412,7 +6121,9 @@
- 	esac
-     ;;
- sunos3*|sunos4*)
--    if test -d /usr/5lib ; then
-+	if test "x$cf_cv_screen" = "xcurses_5lib"
-+	then
-+		if test -d /usr/5lib ; then
- 
- if test -n "/usr/5lib" ; then
-   for cf_add_libdir in /usr/5lib
-@@ -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}:6147: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -5441,7 +6152,8 @@
-   done
- fi
- 
--      LIBS="-lcurses -ltermcap $LIBS"
-+			LIBS="-lcurses -ltermcap $LIBS"
-+		fi
-     fi
-     ac_cv_func_initscr=yes
-     ;;
-@@ -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:6176: checking for tgoto" >&5
- echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
- if test "${ac_cv_func_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5470 "configure"
-+#line 6182 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char tgoto (); below.  */
-@@ -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:6213: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5504: \$? = $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:6219: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5510: \$? = $ac_status" >&5
-+  echo "$as_me:6222: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_tgoto=yes
- else
-@@ -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:6232: result: $ac_cv_func_tgoto" >&5
- echo "${ECHO_T}$ac_cv_func_tgoto" >&6
- if test $ac_cv_func_tgoto = yes; then
-   cf_term_lib=predefined
- else
- 
--        for cf_term_lib in $cf_check_list 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: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 +6246,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_term_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5537 "configure"
-+#line 6249 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:6268: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5559: \$? = $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:6274: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5565: \$? = $ac_status" >&5
-+  echo "$as_me:6277: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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 +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: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 +6308,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_curs_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5599 "configure"
-+#line 6311 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:6330: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5621: \$? = $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:6336: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5627: \$? = $ac_status" >&5
-+  echo "$as_me:6339: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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
-   break
- fi
- 
-     done
--    test $cf_curs_lib = unknown && { { echo "$as_me:5645: 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; }; }
- 
-     LIBS="-l$cf_curs_lib $cf_save_LIBS"
-     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: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 6366 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:6378: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5669: \$? = $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:6384: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5675: \$? = $ac_status" >&5
-+  echo "$as_me:6387: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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: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:6398: error: Cannot link curses library" >&5
- echo "$as_me: error: Cannot link curses library" >&2;}
-    { (exit 1); exit 1; }; }
-     elif test "$cf_curs_lib" = "$cf_term_lib" ; then
-         :
-     elif test "$cf_term_lib" != predefined ; then
--        echo "$as_me:5692: 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 6407 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:6419: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5710: \$? = $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:6425: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5716: \$? = $ac_status" >&5
-+  echo "$as_me:6428: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -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 6437 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:6449: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5740: \$? = $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:6455: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5746: \$? = $ac_status" >&5
-+  echo "$as_me:6458: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:6470: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
-     fi
- fi
- fi
- 
--echo "$as_me:5764: checking for NetBSD form.h" >&5
--echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
--if test "${cf_cv_netbsd_form_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--cat >conftest.$ac_ext <<_ACEOF
--#line 5771 "configure"
--#include "confdefs.h"
--
--#include <${cf_cv_ncurses_header:-curses.h}>
--#include <form.h>
--
--int
--main ()
--{
--
--	FORM *form;
--	int y = current_field(form)->cursor_ypos;
--	int x = current_field(form)->cursor_xpos;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:5793: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5796: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:5799: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cf_cv_netbsd_form_h=yes
--
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--cf_cv_netbsd_form_h=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+	;;
-+ncurses) #(vi
- 
--fi
--echo "$as_me:5811: result: $cf_cv_netbsd_form_h" >&5
--echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
-+cf_ncuconfig_root=ncurses
- 
--test "$cf_cv_netbsd_form_h" = yes && cat >>confdefs.h <<\EOF
--#define HAVE_NETBSD_FORM_H 1
--EOF
-+echo "Looking for ${cf_ncuconfig_root}-config"
- 
--echo "$as_me:5818: 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
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+  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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+  if test -n "$NCURSES_CONFIG"; then
-+  ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # 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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:6503: found $ac_dir/$ac_word" >&5
-+break
-+done
- 
--cat >conftest.$ac_ext <<_ACEOF
--#line 5825 "configure"
--#include "confdefs.h"
--
--#include <${cf_cv_ncurses_header:-curses.h}>
--#include <menu.h>
--
--int
--main ()
--{
--
--	MENU *menu;
--	int y = menu->max_item_width;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:5846: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:5852: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cf_cv_netbsd_menu_h=yes
--
-+fi
-+fi
-+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
-+if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:6511: result: $NCURSES_CONFIG" >&5
-+echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--cf_cv_netbsd_menu_h=no
-+  echo "$as_me:6514: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
- 
-+    test -n "$NCURSES_CONFIG" && break
-+  done
- fi
--echo "$as_me:5864: result: $cf_cv_netbsd_menu_h" >&5
--echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
--
--test "$cf_cv_netbsd_menu_h" = yes && cat >>confdefs.h <<\EOF
--#define HAVE_NETBSD_MENU_H 1
--EOF
--
--	;;
--ncurses)
--
--cf_ncuconfig_root=ncurses
--
--echo "Looking for ${cf_ncuconfig_root}-config"
--for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+if test -z "$NCURSES_CONFIG"; then
-+  ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
- 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:5881: 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
-+if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $NCURSES_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
-+  if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # 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=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:5898: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:6542: found $ac_dir/$ac_word" >&5
-+break
- done
- 
--  ;;
--esac
- fi
--NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
--
--if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:5909: result: $NCURSES_CONFIG" >&5
--echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+fi
-+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
-+if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  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:6553: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--  test -n "$NCURSES_CONFIG" && break
-+  test -n "$ac_ct_NCURSES_CONFIG" && break
- done
--test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none"
-+test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
-+
-+  NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
-+fi
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
-@@ -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: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 +6576,13 @@
- 
- cf_cv_ncurses_header=none
- for cf_header in  \
--    ncurses/curses.h \
--	ncurses/ncurses.h \
--	curses.h \
--	ncurses.h
-+    ncurses/ncurses.h \
-+	ncurses/curses.h \
-+	ncurses.h \
-+	curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5941 "configure"
-+#line 6585 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -5950,16 +6594,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5953: \"$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: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:6603: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5962: \$? = $ac_status" >&5
-+  echo "$as_me:6606: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -5970,11 +6614,11 @@
- done
- 
- fi
--echo "$as_me:5973: 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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5993 "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:6641: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:6003: \$? = $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 +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: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 +6716,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6075 "configure"
-+#line 6719 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6084,16 +6728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6087: \"$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: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:6737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6096: \$? = $ac_status" >&5
-+  echo "$as_me:6740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:6757: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6127,7 +6771,7 @@
- 
- }
- 
--echo "$as_me:6130: 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 +6783,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6142 "configure"
-+#line 6786 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6163,16 +6807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6166: \"$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: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:6816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6175: \$? = $ac_status" >&5
-+  echo "$as_me:6819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6187,14 +6831,14 @@
- 	done
- 
- fi
--echo "$as_me:6190: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6834: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:6197: 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 +6978,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6337 "configure"
-+#line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6346,16 +6990,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6349: \"$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: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:6999: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6358: \$? = $ac_status" >&5
-+  echo "$as_me:7002: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:7019: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6393,7 +7037,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6396 "configure"
-+#line 7040 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6417,16 +7061,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6420: \"$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: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:7070: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6429: \$? = $ac_status" >&5
-+  echo "$as_me:7073: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -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:7094: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6455: 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 +7129,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6488 "configure"
-+#line 7132 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6497,16 +7141,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6500: \"$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: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:7150: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6509: \$? = $ac_status" >&5
-+  echo "$as_me:7153: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:7170: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6566,7 +7210,7 @@
- 	;;
- esac
- 
--echo "$as_me:6569: 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 +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 7231 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6599,16 +7243,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6602: \"$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: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:7252: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6611: \$? = $ac_status" >&5
-+  echo "$as_me:7255: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6624,7 +7268,7 @@
- done
- 
- fi
--echo "$as_me:6627: 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 +7302,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:6661: 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 +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:7331: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6690: \$? = $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 +7341,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6700 "configure"
-+#line 7344 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6722,15 +7366,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6725: \"$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:7372: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6730: \"$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:7377: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6744,7 +7388,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:6747: 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 +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: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 +7408,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6767 "configure"
-+#line 7411 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:7430: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6789: \$? = $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:7436: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6795: \$? = $ac_status" >&5
-+  echo "$as_me:7439: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -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: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: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 +7458,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6817 "configure"
-+#line 7461 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:7480: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6839: \$? = $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:7486: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6845: \$? = $ac_status" >&5
-+  echo "$as_me:7489: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -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: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 +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: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 +7520,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6879 "configure"
-+#line 7523 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:7542: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6901: \$? = $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:7548: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6907: \$? = $ac_status" >&5
-+  echo "$as_me:7551: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -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: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 +7578,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:6937: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6943 "configure"
-+#line 7587 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -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:7618: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6977: \$? = $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:7624: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6983: \$? = $ac_status" >&5
-+  echo "$as_me:7627: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -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:7637: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:7000: 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 7648 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:7660: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7019: \$? = $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:7666: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7025: \$? = $ac_status" >&5
-+  echo "$as_me:7669: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7027: result: yes" >&5
-+  echo "$as_me:7671: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7034: result: no" >&5
-+echo "$as_me:7678: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -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: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 7772 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:7784: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7143: \$? = $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:7790: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7149: \$? = $ac_status" >&5
-+  echo "$as_me:7793: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7151: result: yes" >&5
-+  echo "$as_me:7795: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7158: result: no" >&5
-+echo "$as_me:7802: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -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: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 +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: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 +7832,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7191 "configure"
-+#line 7835 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:7847: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7206: \$? = $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:7853: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7212: \$? = $ac_status" >&5
-+  echo "$as_me:7856: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7214: result: yes" >&5
-+  echo "$as_me:7858: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7219: result: no" >&5
-+echo "$as_me:7863: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7232,10 +7876,9 @@
- fi
- 
- 	;;
--ncursesw)
--	cf_cv_libtype=w
-+ncursesw) #(vi
- 
--echo "$as_me:7238: 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 +7886,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7246 "configure"
-+#line 7889 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -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:7902: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7262: \$? = $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:7908: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7268: \$? = $ac_status" >&5
-+  echo "$as_me:7911: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -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}:7923: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7285 "configure"
-+#line 7928 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:7941: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7301: \$? = $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:7947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7307: \$? = $ac_status" >&5
-+  echo "$as_me:7950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -7318,7 +7961,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7321 "configure"
-+#line 7964 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:7977: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7337: \$? = $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:7983: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7343: \$? = $ac_status" >&5
-+  echo "$as_me:7986: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -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}: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}:8005: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-     cf_save_CPPFLAGS="$CPPFLAGS"
-     cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -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}: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 8122 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -7489,21 +8132,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7492: \"$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: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:8141: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7501: \$? = $ac_status" >&5
-+  echo "$as_me:8144: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:7506: 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 +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}:8167: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-       cf_save_LIBS="$LIBS"
-       cf_save_LDFLAGS="$LDFLAGS"
-@@ -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}:8264: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
-             CPPFLAGS="$cf_test_CPPFLAGS"
-             LIBS="-lutf8  $cf_save_LIBS"
-             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
-             cat >conftest.$ac_ext <<_ACEOF
--#line 7627 "configure"
-+#line 8270 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -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:8283: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7643: \$? = $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:8289: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7649: \$? = $ac_status" >&5
-+  echo "$as_me:8292: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:7654: 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 +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: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 +8370,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7730 "configure"
-+#line 8373 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7739,16 +8382,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7742: \"$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: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:8391: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7751: \$? = $ac_status" >&5
-+  echo "$as_me:8394: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:8411: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -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}:8445: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -7813,48 +8456,87 @@
- cf_ncuconfig_root=ncursesw
- 
- echo "Looking for ${cf_ncuconfig_root}-config"
--for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
-+  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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NCURSES_CONFIG"; then
-+  ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # 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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:8480: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
-+if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:8488: result: $NCURSES_CONFIG" >&5
-+echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+else
-+  echo "$as_me:8491: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+    test -n "$NCURSES_CONFIG" && break
-+  done
-+fi
-+if test -z "$NCURSES_CONFIG"; then
-+  ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG
-+  for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
- 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:7820: 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
-+if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $NCURSES_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
-+  if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # 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=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:7837: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:8519: found $ac_dir/$ac_word" >&5
-+break
- done
- 
--  ;;
--esac
- fi
--NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
--
--if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:7848: result: $NCURSES_CONFIG" >&5
--echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+fi
-+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
-+if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  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:8530: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--  test -n "$NCURSES_CONFIG" && break
-+  test -n "$ac_ct_NCURSES_CONFIG" && break
- done
--test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none"
-+test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none"
-+
-+  NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG
-+fi
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
-@@ -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: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 +8553,13 @@
- 
- cf_cv_ncurses_header=none
- for cf_header in  \
--    ncursesw/curses.h \
--	ncursesw/ncurses.h \
--	curses.h \
--	ncurses.h
-+    ncursesw/ncurses.h \
-+	ncursesw/curses.h \
-+	ncurses.h \
-+	curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 7880 "configure"
-+#line 8562 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -7889,16 +8571,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7892: \"$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: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:8580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7901: \$? = $ac_status" >&5
-+  echo "$as_me:8583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -7909,11 +8591,11 @@
- done
- 
- fi
--echo "$as_me:7912: 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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7932 "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:8618: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:7942: \$? = $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 +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: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 +8693,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8014 "configure"
-+#line 8696 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8023,16 +8705,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8026: \"$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: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:8714: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8035: \$? = $ac_status" >&5
-+  echo "$as_me:8717: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:8734: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8066,7 +8748,7 @@
- 
- }
- 
--echo "$as_me:8069: 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 +8760,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8081 "configure"
-+#line 8763 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -8110,16 +8792,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8113: \"$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: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:8801: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8122: \$? = $ac_status" >&5
-+  echo "$as_me:8804: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -8134,14 +8816,14 @@
- 	done
- 
- fi
--echo "$as_me:8137: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:8819: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:8144: 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 +8963,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8284 "configure"
-+#line 8966 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8293,16 +8975,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8296: \"$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: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:8984: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8305: \$? = $ac_status" >&5
-+  echo "$as_me:8987: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:9004: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8340,7 +9022,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8343 "configure"
-+#line 9025 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -8364,16 +9046,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8367: \"$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: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:9055: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8376: \$? = $ac_status" >&5
-+  echo "$as_me:9058: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -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:9079: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:8402: 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 +9114,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8435 "configure"
-+#line 9117 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8444,16 +9126,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8447: \"$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: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:9135: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8456: \$? = $ac_status" >&5
-+  echo "$as_me:9138: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:9155: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8513,7 +9195,7 @@
- 	;;
- esac
- 
--echo "$as_me:8516: 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 +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 9216 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8546,16 +9228,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8549: \"$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: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:9237: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8558: \$? = $ac_status" >&5
-+  echo "$as_me:9240: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -8571,7 +9253,7 @@
- done
- 
- fi
--echo "$as_me:8574: 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 +9287,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:8608: 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 +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:9316: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8637: \$? = $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 +9326,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8647 "configure"
-+#line 9329 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8669,15 +9351,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8672: \"$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:9357: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8677: \"$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:9362: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8691,7 +9373,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:8694: 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 +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: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 +9393,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8714 "configure"
-+#line 9396 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:9415: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8736: \$? = $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:9421: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8742: \$? = $ac_status" >&5
-+  echo "$as_me:9424: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -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: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: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 +9443,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8764 "configure"
-+#line 9446 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:9465: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8786: \$? = $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:9471: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8792: \$? = $ac_status" >&5
-+  echo "$as_me:9474: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -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: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 +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: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 +9505,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8826 "configure"
-+#line 9508 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:9527: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8848: \$? = $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:9533: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8854: \$? = $ac_status" >&5
-+  echo "$as_me:9536: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -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: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 +9563,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:8884: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8890 "configure"
-+#line 9572 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -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:9603: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8924: \$? = $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:9609: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8930: \$? = $ac_status" >&5
-+  echo "$as_me:9612: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -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:9622: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:8947: 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 9633 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:9645: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8966: \$? = $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:9651: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8972: \$? = $ac_status" >&5
-+  echo "$as_me:9654: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8974: result: yes" >&5
-+  echo "$as_me:9656: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8981: result: no" >&5
-+echo "$as_me:9663: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -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: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 9757 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:9769: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9090: \$? = $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:9775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9096: \$? = $ac_status" >&5
-+  echo "$as_me:9778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:9098: result: yes" >&5
-+  echo "$as_me:9780: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:9105: result: no" >&5
-+echo "$as_me:9787: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -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: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 +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: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 +9817,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9138 "configure"
-+#line 9820 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -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:9832: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9153: \$? = $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:9838: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9159: \$? = $ac_status" >&5
-+  echo "$as_me:9841: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:9161: result: yes" >&5
-+  echo "$as_me:9843: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:9166: result: no" >&5
-+echo "$as_me:9848: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -9179,9 +9861,9 @@
- fi
- 
- 	;;
--pdcurses) #(vi
-+pdcurses)
- 
--echo "$as_me:9184: 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 +9873,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:9194: 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 +9881,11 @@
- 	PKG_CONFIG=none
- 	;;
- yes) #(vi
--	if test -n "$ac_tool_prefix"; then
-+
-+if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:9205: 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 +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:9905: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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:9916: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:9236: result: no" >&5
-+  echo "$as_me:9919: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +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:9945: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -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: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:9960: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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: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 +10008,7 @@
- 
- fi
- 
--echo "$as_me:9328: 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 +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 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:10112: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9435: \$? = $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 +10148,7 @@
-   ac_save_LIBS=$LIBS
-   LIBS="-lXt $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9468 "configure"
-+#line 10151 "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
- int
-@@ -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:10163: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9483: \$? = $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:10169: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9489: \$? = $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 +10207,7 @@
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  echo "$as_me:9527: result: $have_x" >&5
-+  echo "$as_me:10210: result: $have_x" >&5
- echo "${ECHO_T}$have_x" >&6
-   no_x=yes
- else
-@@ -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:10220: result: libraries $x_libraries, headers $x_includes" >&5
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
-@@ -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: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 10248 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:10260: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9580: \$? = $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:10266: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9586: \$? = $ac_status" >&5
-+  echo "$as_me:10269: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_R_nospace=yes
- else
-@@ -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:10279: result: no" >&5
- echo "${ECHO_T}no" >&6
- 	X_LIBS="$X_LIBS -R$x_libraries"
-       else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9602 "configure"
-+#line 10285 "configure"
- #include "confdefs.h"
- 
- int
-@@ -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:10297: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9617: \$? = $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:10303: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9623: \$? = $ac_status" >&5
-+  echo "$as_me:10306: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_R_space=yes
- else
-@@ -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: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:10320: result: neither works" >&5
- echo "${ECHO_T}neither works" >&6
- 	fi
-       fi
-@@ -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 10340 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10359: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9679: \$? = $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:10365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9685: \$? = $ac_status" >&5
-+  echo "$as_me:10368: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:9691: 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 +10379,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9699 "configure"
-+#line 10382 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10401: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9721: \$? = $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:10407: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9727: \$? = $ac_status" >&5
-+  echo "$as_me:10410: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dnet_dnet_ntoa=yes
- else
-@@ -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: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
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
- 
-     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: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 +10433,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9753 "configure"
-+#line 10436 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10455: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9775: \$? = $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:10461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9781: \$? = $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 +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: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 +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:10494: checking for gethostbyname" >&5
- echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9817 "configure"
-+#line 10500 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname (); below.  */
-@@ -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:10531: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9851: \$? = $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:10537: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9857: \$? = $ac_status" >&5
-+  echo "$as_me:10540: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gethostbyname=yes
- else
-@@ -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: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: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 +10559,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9879 "configure"
-+#line 10562 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10581: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9901: \$? = $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:10587: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9907: \$? = $ac_status" >&5
-+  echo "$as_me:10590: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_nsl_gethostbyname=yes
- else
-@@ -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: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
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
- 
-       if test $ac_cv_lib_nsl_gethostbyname = no; then
--        echo "$as_me:9925: 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 +10613,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9933 "configure"
-+#line 10616 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10635: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9955: \$? = $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:10641: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9961: \$? = $ac_status" >&5
-+  echo "$as_me:10644: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gethostbyname=yes
- else
-@@ -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: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 +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:10671: checking for connect" >&5
- echo $ECHO_N "checking for connect... $ECHO_C" >&6
- if test "${ac_cv_func_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9994 "configure"
-+#line 10677 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect (); below.  */
-@@ -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:10708: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10028: \$? = $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:10714: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10034: \$? = $ac_status" >&5
-+  echo "$as_me:10717: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_connect=yes
- else
-@@ -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: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: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 +10736,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10056 "configure"
-+#line 10739 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10758: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10078: \$? = $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:10764: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10084: \$? = $ac_status" >&5
-+  echo "$as_me:10767: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_socket_connect=yes
- else
-@@ -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: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 +10784,13 @@
-     fi
- 
-     # Guillermo Gomez says -lposix is necessary on A/UX.
--    echo "$as_me:10104: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10110 "configure"
-+#line 10793 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove (); below.  */
-@@ -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:10824: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10144: \$? = $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:10830: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10150: \$? = $ac_status" >&5
-+  echo "$as_me:10833: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_remove=yes
- else
-@@ -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: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: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 +10852,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10172 "configure"
-+#line 10855 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10874: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10194: \$? = $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:10880: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10200: \$? = $ac_status" >&5
-+  echo "$as_me:10883: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_posix_remove=yes
- else
-@@ -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: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 +10900,13 @@
-     fi
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    echo "$as_me:10220: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10226 "configure"
-+#line 10909 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat (); below.  */
-@@ -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:10940: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10260: \$? = $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:10946: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10266: \$? = $ac_status" >&5
-+  echo "$as_me:10949: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_shmat=yes
- else
-@@ -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: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: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 +10968,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10288 "configure"
-+#line 10971 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:10990: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10310: \$? = $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:10996: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10316: \$? = $ac_status" >&5
-+  echo "$as_me:10999: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_ipc_shmat=yes
- else
-@@ -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: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 +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: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 +11033,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10353 "configure"
-+#line 11036 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:11055: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10375: \$? = $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:11061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10381: \$? = $ac_status" >&5
-+  echo "$as_me:11064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-@@ -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: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 +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: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 +11095,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=Xaw3d
--	echo "$as_me:10415: 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: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: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 +11113,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=neXtaw
--	echo "$as_me:10433: 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: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: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 +11131,10 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=XawPlus
--	echo "$as_me:10451: 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:11137: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -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}:11157: testing found package $cf_athena_pkg ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
- 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10480: 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}:11167: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10581 "configure"
-+#line 11264 "configure"
- #include "confdefs.h"
- 
- #include <X11/Xmu/CharSet.h>
-@@ -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:11280: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10600: \$? = $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:11286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10606: \$? = $ac_status" >&5
-+  echo "$as_me:11289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xaw_compat=yes
- else
-@@ -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:11299: result: $cf_cv_xaw_compat" >&5
- echo "${ECHO_T}$cf_cv_xaw_compat" >&6
- 
- 			if test "$cf_cv_xaw_compat" = no
-@@ -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}:11311: testing work around broken package ..." 1>&5
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
- 	test -n "$verbose" && echo "	found package xmu" 1>&6
- 
--echo "${as_me:-configure}:10633: 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`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
- 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10639: 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}:11326: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -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}:11412: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/  / /g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10734: testing ...after  $LIBS ..." 1>&5
-+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}:11438: testing found package Xext ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
- 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10761: 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}:11448: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -10846,7 +11529,7 @@
- 	:
- else
- 
--	echo "$as_me:10849: 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 +11537,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10857 "configure"
-+#line 11540 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:11559: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10879: \$? = $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:11565: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10885: \$? = $ac_status" >&5
-+  echo "$as_me:11568: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Xext_XextCreateExtension=yes
- else
-@@ -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: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 +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}:11592: testing found package xt ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
- 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10915: 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}:11602: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11013 "configure"
-+#line 11696 "configure"
- #include "confdefs.h"
- 
- #include <X11/Xlib.h>
-@@ -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:11715: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11035: \$? = $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:11721: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11041: \$? = $ac_status" >&5
-+  echo "$as_me:11724: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xt_x11_compat=yes
- else
-@@ -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: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
- 		then
- 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
- 
--echo "${as_me:-configure}:11057: 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.
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
- 	test -n "$verbose" && echo "	found package x11" 1>&6
- 
--echo "${as_me:-configure}:11064: 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`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
- 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11070: 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}:11757: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -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}:11843: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/  / /g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:11165: testing ...after  $LIBS ..." 1>&5
-+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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11180 "configure"
-+#line 11863 "configure"
- #include "confdefs.h"
- 
- #include <X11/Shell.h>
-@@ -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:11878: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11198: \$? = $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:11884: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11204: \$? = $ac_status" >&5
-+  echo "$as_me:11887: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xt_ice_compat=yes
- else
-@@ -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: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 +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}:11911: testing work around broken ICE dependency ..." 1>&5
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
- 	test -n "$verbose" && echo "	found package ice" 1>&6
- 
--echo "${as_me:-configure}:11233: 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`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
- 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11239: 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}:11926: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -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}:12011: testing found package sm ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
- 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11334: 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}:12021: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -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}:12111: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:11433: testing ...after  $LIBS ..." 1>&5
-+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}:12134: testing checking additions to CFLAGS ..." 1>&5
- 
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
-@@ -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}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -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}:12213: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -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}:12221: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
- if test "$cf_check_cflags" != "$CFLAGS" ; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 11545 "configure"
-+#line 12228 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -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:12240: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11560: \$? = $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:12246: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11566: \$? = $ac_status" >&5
-+  echo "$as_me:12249: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:12257: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
- 
- 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
--echo "${as_me:-configure}:11579: 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 +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:12270: checking for XOpenDisplay" >&5
- echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
- if test "${ac_cv_func_XOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11593 "configure"
-+#line 12276 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char XOpenDisplay (); below.  */
-@@ -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:12307: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11627: \$? = $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:12313: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11633: \$? = $ac_status" >&5
-+  echo "$as_me:12316: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_XOpenDisplay=yes
- else
-@@ -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:12326: result: $ac_cv_func_XOpenDisplay" >&5
- echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
- if test $ac_cv_func_XOpenDisplay = yes; then
-   :
- else
- 
--	echo "$as_me:11649: 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 +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 12340 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:12359: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11679: \$? = $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:12365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11685: \$? = $ac_status" >&5
-+  echo "$as_me:12368: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_X11_XOpenDisplay=yes
- else
-@@ -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: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 +12384,13 @@
- 
- fi
- 
--	echo "$as_me:11704: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11710 "configure"
-+#line 12393 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char XtAppInitialize (); below.  */
-@@ -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:12424: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11744: \$? = $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:12430: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11750: \$? = $ac_status" >&5
-+  echo "$as_me:12433: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_XtAppInitialize=yes
- else
-@@ -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:12443: result: $ac_cv_func_XtAppInitialize" >&5
- echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
- if test $ac_cv_func_XtAppInitialize = yes; then
-   :
- else
- 
--	echo "$as_me:11766: 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 +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 12457 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:12476: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11796: \$? = $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:12482: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11802: \$? = $ac_status" >&5
-+  echo "$as_me:12485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Xt_XtAppInitialize=yes
- else
-@@ -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: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 +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: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 +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: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: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 12541 "configure"
- #include "confdefs.h"
- 
- #include <X11/Intrinsic.h>
-@@ -11869,16 +12552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11872: \"$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: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:12561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11881: \$? = $ac_status" >&5
-+  echo "$as_me:12564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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: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 +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: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 +12598,29 @@
- 	/usr/local
- do
- 	for cf_lib in \
--		"-l$cf_x_athena_root -lXmu" \
--		"-l$cf_x_athena_root -lXpm -lXmu" \
--		"-l${cf_x_athena_root}_s -lXmu_s"
-+		${cf_x_athena_root} \
-+		${cf_x_athena_root}7 \
-+		${cf_x_athena_root}6
-+	do
-+	for cf_libs in \
-+		"-l$cf_lib -lXmu" \
-+		"-l$cf_lib -lXpm -lXmu" \
-+		"-l${cf_lib}_s -lXmu_s"
- 	do
- 		if test -z "$cf_x_athena_lib" ; then
- 			cf_save="$LIBS"
- 			cf_test=XawSimpleMenuAddGlobalActions
- 			if test $cf_path != default ; then
--				LIBS="-L$cf_path/lib $cf_lib $LIBS"
--				echo "$as_me:11927: checking for $cf_lib in $cf_path" >&5
--echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
-+				LIBS="-L$cf_path/lib $cf_libs $LIBS"
-+				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
--				LIBS="$cf_lib $LIBS"
--				echo "$as_me:11931: checking for $cf_test in $cf_lib" >&5
--echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
-+				LIBS="$cf_libs $LIBS"
-+				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 12623 "configure"
- #include "confdefs.h"
- 
- #include <X11/Intrinsic.h>
-@@ -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:12639: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11954: \$? = $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:12645: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11960: \$? = $ac_status" >&5
-+  echo "$as_me:12648: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:12657: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 			if test "$cf_result" = yes ; then
--				cf_x_athena_lib="$cf_lib"
-+				cf_x_athena_lib="$cf_libs"
- 				break
- 			fi
- 			LIBS="$cf_save"
- 		fi
--	done
-+	done # cf_libs
-+		test -n "$cf_x_athena_lib" && break
-+	done # cf_lib
- done
- 
- 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: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 +12681,86 @@
- 
- fi
- 
--for ac_prog in xcurses-config
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in xcurses-config
-+  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: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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$XCURSES_CONFIG"; then
-+  ac_cv_prog_XCURSES_CONFIG="$XCURSES_CONFIG" # 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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:12704: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
-+if test -n "$XCURSES_CONFIG"; then
-+  echo "$as_me:12712: result: $XCURSES_CONFIG" >&5
-+echo "${ECHO_T}$XCURSES_CONFIG" >&6
-+else
-+  echo "$as_me:12715: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+    test -n "$XCURSES_CONFIG" && break
-+  done
-+fi
-+if test -z "$XCURSES_CONFIG"; then
-+  ac_ct_XCURSES_CONFIG=$XCURSES_CONFIG
-+  for ac_prog in xcurses-config
- 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:11998: 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
-+if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $XCURSES_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
-+  if test -n "$ac_ct_XCURSES_CONFIG"; then
-+  ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_ct_XCURSES_CONFIG" # 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=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:12015: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-+echo "$as_me:12743: found $ac_dir/$ac_word" >&5
-+break
- done
- 
--  ;;
--esac
- fi
--XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
--
--if test -n "$XCURSES_CONFIG"; then
--  echo "$as_me:12026: result: $XCURSES_CONFIG" >&5
--echo "${ECHO_T}$XCURSES_CONFIG" >&6
-+fi
-+ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
-+if test -n "$ac_ct_XCURSES_CONFIG"; then
-+  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:12754: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--  test -n "$XCURSES_CONFIG" && break
-+  test -n "$ac_ct_XCURSES_CONFIG" && break
- done
--test -n "$XCURSES_CONFIG" || XCURSES_CONFIG="none"
-+test -n "$ac_ct_XCURSES_CONFIG" || ac_ct_XCURSES_CONFIG="none"
-+
-+  XCURSES_CONFIG=$ac_ct_XCURSES_CONFIG
-+fi
- 
- if test "$XCURSES_CONFIG" != none ; then
- 
-@@ -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}:12778: testing checking additions to CFLAGS ..." 1>&5
- 
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
-@@ -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}:12849: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -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}:12857: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -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}:12865: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
- if test "$cf_check_cflags" != "$CFLAGS" ; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 12144 "configure"
-+#line 12872 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -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:12884: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12159: \$? = $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:12890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12165: \$? = $ac_status" >&5
-+  echo "$as_me:12893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -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}:12901: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
- 
- 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
--echo "${as_me:-configure}:12178: 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 +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: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 +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 12922 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:12941: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12216: \$? = $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:12947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12222: \$? = $ac_status" >&5
-+  echo "$as_me:12950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_X11_XOpenDisplay=yes
- else
-@@ -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: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
-   LIBS="-lX11 $LIBS"
- fi
- 
--echo "$as_me:12239: 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 +12972,7 @@
- 
- LIBS="-lXCurses $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12247 "configure"
-+#line 12975 "configure"
- #include "confdefs.h"
- 
- #include <xcurses.h>
-@@ -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:12990: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12265: \$? = $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:12996: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12271: \$? = $ac_status" >&5
-+  echo "$as_me:12999: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_lib_XCurses=yes
- else
-@@ -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:13010: result: $cf_cv_lib_XCurses" >&5
- echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
- 
- fi
-@@ -12293,23 +13021,23 @@
- #define XCURSES 1
- EOF
- 
--	echo "$as_me:12296: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12302 "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:13034: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12312: \$? = $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 +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: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 +13066,7 @@
- fi
- 
- else
--	{ { echo "$as_me:12341: 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 +13074,122 @@
- 	;;
- esac
- 
-+case $cf_cv_screen in
-+curses|curses_*)
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 13087 "configure"
-+#include "confdefs.h"
-+
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#include <form.h>
-+
-+int
-+main ()
-+{
-+
-+	FORM *form;
-+	int y = current_field(form)->cursor_ypos;
-+	int x = current_field(form)->cursor_xpos;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13109: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13115: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_netbsd_form_h=yes
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_netbsd_form_h=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:13127: result: $cf_cv_netbsd_form_h" >&5
-+echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
-+
-+test "$cf_cv_netbsd_form_h" = yes && cat >>confdefs.h <<\EOF
-+#define HAVE_NETBSD_FORM_H 1
-+EOF
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 13141 "configure"
-+#include "confdefs.h"
-+
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#include <menu.h>
-+
-+int
-+main ()
-+{
-+
-+	MENU *menu;
-+	int y = menu->max_item_width;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13159: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13162: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13168: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_netbsd_menu_h=yes
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_netbsd_menu_h=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:13180: result: $cf_cv_netbsd_menu_h" >&5
-+echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
-+
-+test "$cf_cv_netbsd_menu_h" = yes && cat >>confdefs.h <<\EOF
-+#define HAVE_NETBSD_MENU_H 1
-+EOF
-+
-+	;;
-+ncursesw)
-+	cf_cv_libtype=w
-+	;;
-+esac
-+
- case $cf_cv_screen in #(vi
- pdcurses) #(vi
- 	;;
-@@ -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: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 +13205,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpanel$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12364 "configure"
-+#line 13208 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13227: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12386: \$? = $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:13233: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12392: \$? = $ac_status" >&5
-+  echo "$as_me:13236: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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 +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: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 +13264,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmenu$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12423 "configure"
-+#line 13267 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13286: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12445: \$? = $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:13292: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12451: \$? = $ac_status" >&5
-+  echo "$as_me:13295: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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 +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: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 +13323,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lform$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12482 "configure"
-+#line 13326 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -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:13345: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12504: \$? = $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:13351: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12510: \$? = $ac_status" >&5
-+  echo "$as_me:13354: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12550 "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:13398: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12560: \$? = $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 +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: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 +13433,13 @@
- 	;;
- esac
- 
--echo "$as_me:12592: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12598 "configure"
-+#line 13442 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -12617,16 +13461,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12620: \"$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: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:13470: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12629: \$? = $ac_status" >&5
-+  echo "$as_me:13473: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signal=void
- else
-@@ -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:13483: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
- cat >>confdefs.h <<EOF
- #define RETSIGTYPE $ac_cv_type_signal
- EOF
- 
--echo "$as_me:12646: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12652 "configure"
-+#line 13496 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -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:13504: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12666: \$? = $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 +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 13532 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -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 13550 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -12724,7 +13568,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12727 "configure"
-+#line 13571 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12750,15 +13594,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12753: \"$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:13600: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12758: \"$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:13605: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12771,146 +13615,319 @@
- fi
- fi
- fi
--echo "$as_me:12774: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
--if test $ac_cv_header_stdc = yes; then
--
--cat >>confdefs.h <<\EOF
--#define STDC_HEADERS 1
-+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
-+
-+cat >>confdefs.h <<\EOF
-+#define STDC_HEADERS 1
-+EOF
-+
-+fi
-+
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 13634 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13650: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13653: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13659: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_header_time=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_header_time=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+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
-+
-+cat >>confdefs.h <<\EOF
-+#define TIME_WITH_SYS_TIME 1
-+EOF
-+
-+fi
-+
-+for ac_header in \
-+getopt.h \
-+locale.h \
-+math.h \
-+stdarg.h \
-+sys/ioctl.h \
-+sys/select.h \
-+sys/time.h \
-+termios.h \
-+unistd.h \
-+
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 13698 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:13702: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:13708: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+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
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+EOF
-+
-+fi
-+done
-+
-+for ac_header in unistd.h getopt.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 13746 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:13750: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:13756: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+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
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- EOF
- 
- fi
-+done
- 
--echo "$as_me:12784: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
--if test "${ac_cv_header_time+set}" = set; then
-+echo "$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 12790 "configure"
-+
-+cf_cv_getopt_header=none
-+for cf_header in stdio.h stdlib.h unistd.h getopt.h
-+do
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 13795 "configure"
- #include "confdefs.h"
--#include <sys/types.h>
--#include <sys/time.h>
--#include <time.h>
- 
-+#include <$cf_header>
- int
- main ()
- {
--if ((struct tm *) 0)
--return 0;
-+int x = optind; char *y = optarg
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12806: \"$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: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:13814: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12815: \$? = $ac_status" >&5
-+  echo "$as_me:13817: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_header_time=yes
-+  cf_cv_getopt_header=$cf_header
-+ break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--ac_cv_header_time=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:12825: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
--if test $ac_cv_header_time = yes; then
-+done
- 
--cat >>confdefs.h <<\EOF
--#define TIME_WITH_SYS_TIME 1
-+fi
-+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
-+	cat >>confdefs.h <<\EOF
-+#define HAVE_GETOPT_HEADER 1
- EOF
- 
- fi
- 
--for ac_header in \
--getopt.h \
--locale.h \
--math.h \
--stdarg.h \
--sys/ioctl.h \
--sys/select.h \
--sys/time.h \
--termios.h \
--unistd.h \
-+for ac_func in \
-+gettimeofday \
-+strdup \
- 
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:12848: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12854 "configure"
-+#line 13850 "configure"
- #include "confdefs.h"
--#include <$ac_header>
-+/* 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
--if { (eval echo "$as_me:12858: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:13881: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-   ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:12864: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
-+  echo "$as_me:13884: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13890: \$? = $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_Header=no"
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12883: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+echo "$as_me: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
-   cat >>confdefs.h <<EOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- EOF
- 
- fi
- done
- 
-+if test "$cf_enable_widec" = yes; then
-+
- for ac_func in \
--gettimeofday \
- mblen \
- mbrlen \
- mbrtowc \
- mbsrtowcs \
- mbstowcs \
- mbtowc \
--strdup \
- wcsrtombs \
- wcstombs \
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:12907: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12913 "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.  */
-@@ -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:13961: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12947: \$? = $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:13967: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12953: \$? = $ac_status" >&5
-+  echo "$as_me:13970: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -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: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 +13987,16 @@
- fi
- done
- 
--echo "$as_me:12973: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+fi
-+
-+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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12980 "configure"
-+#line 13999 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -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:14021: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13005: \$? = $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:14027: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13011: \$? = $ac_status" >&5
-+  echo "$as_me:14030: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 13018 "configure"
-+#line 14037 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -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:14059: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13043: \$? = $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:14065: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13049: \$? = $ac_status" >&5
-+  echo "$as_me:14068: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=yes
- else
-@@ -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: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: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 +14089,20 @@
- 
- # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
- # for <term.h> if we do not find the variant.
--for cf_header in \
--	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
--	term.h
-+
-+cf_header_list="term.h ncurses/term.h ncursesw/term.h"
-+
-+case ${cf_cv_ncurses_header:-curses.h} in #(vi
-+*/*)
-+	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
-+	cf_header_list="$cf_header_item $cf_header_list"
-+	;;
-+esac
-+
-+for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13078 "configure"
-+#line 14105 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13089,16 +14116,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13092: \"$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: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:14125: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13101: \$? = $ac_status" >&5
-+  echo "$as_me:14128: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 	 break
-@@ -13117,7 +14144,7 @@
- 	for cf_header in ncurses/term.h ncursesw/term.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13120 "configure"
-+#line 14147 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13135,16 +14162,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13138: \"$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: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:14171: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13147: \$? = $ac_status" >&5
-+  echo "$as_me:14174: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 			 break
-@@ -13159,7 +14186,7 @@
- esac
- 
- fi
--echo "$as_me:13162: 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 +14210,96 @@
- 	;;
- esac
- 
-+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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look
-+# for <unctrl.h> if we do not find the variant.
-+
-+cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
-+
-+case ${cf_cv_ncurses_header:-curses.h} in #(vi
-+*/*)
-+	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
-+	cf_header_list="$cf_header_item $cf_header_list"
-+	;;
-+esac
-+
-+for cf_header in $cf_header_list
-+do
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 14234 "configure"
-+#include "confdefs.h"
-+
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#include <${cf_header}>
-+int
-+main ()
-+{
-+WINDOW *x
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14251: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14257: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_unctrl_header=$cf_header
-+	 break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_unctrl_header=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+
-+case $cf_cv_unctrl_header in #(vi
-+no)
-+	{ echo "$as_me:14271: WARNING: unctrl.h header not found" >&5
-+echo "$as_me: WARNING: unctrl.h header not found" >&2;}
-+	;;
-+esac
-+
-+fi
-+echo "$as_me:14277: result: $cf_cv_unctrl_header" >&5
-+echo "${ECHO_T}$cf_cv_unctrl_header" >&6
-+
-+case $cf_cv_unctrl_header in #(vi
-+unctrl.h) #(vi
-+	cat >>confdefs.h <<\EOF
-+#define HAVE_UNCTRL_H 1
-+EOF
-+
-+	;;
-+ncurses/unctrl.h) #(vi
-+	cat >>confdefs.h <<\EOF
-+#define HAVE_NCURSES_UNCTRL_H 1
-+EOF
-+
-+	;;
-+ncursesw/unctrl.h)
-+	cat >>confdefs.h <<\EOF
-+#define HAVE_NCURSESW_UNCTRL_H 1
-+EOF
-+
-+	;;
-+esac
-+
- for cf_func in \
-+assume_default_colors \
- chgat \
- color_set \
- filter \
-@@ -13210,8 +14326,10 @@
- tigetstr \
- typeahead \
- use_default_colors \
--vw_printw \
-+use_screen \
-+use_window \
- vsscanf \
-+vw_printw \
- wchgat \
- winsstr \
- wresize \
-@@ -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:14342: checking for ${cf_func}" >&5
-+echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
-+
-+echo "${as_me:-configure}:14345: testing ${cf_func} ..." 1>&5
-+
-+	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+		eval cf_result='$ac_cv_func_'$cf_func
-+		if test ".$cf_result" != ".no"; then
-+			cat >conftest.$ac_ext <<_ACEOF
-+#line 14354 "configure"
-+#include "confdefs.h"
-+
-+#ifdef HAVE_XCURSES
-+#include <xcurses.h>
-+char * XCursesProgramName = "test";
-+#else
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
-+#include <ncursesw/term.h>
-+#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
-+#include <ncurses/term.h>
-+#elif defined(HAVE_TERM_H)
-+#include <term.h>
-+#endif
-+#endif
-+
-+int
-+main ()
-+{
-+
-+#ifndef ${cf_func}
-+long foo = (long)(&${cf_func});
-+if (foo + 1234 > 5678)
-+	${cf_cv_main_return:-return}(foo);
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14386: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14389: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14395: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_result=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_result=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+		fi
-+		eval 'cf_cv_func_'$cf_func'=$cf_result'
-+
-+fi
-+
-+	# use the computed/retrieved cache-value:
-+	eval 'cf_result=$cf_cv_func_'$cf_func
-+	echo "$as_me:14411: result: $cf_result" >&5
-+echo "${ECHO_T}$cf_result" >&6
-+	if test $cf_result != no; then
-+		cat >>confdefs.h <<EOF
-+#define HAVE_${cf_tr_func} 1
-+EOF
-+
-+	fi
-+done
-+
-+for cf_func in tputs
-+do
-+
-+cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+
-+	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}: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 +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 14438 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -13256,7 +14458,8 @@
- 
- #ifndef ${cf_func}
- long foo = (long)(&${cf_func});
--${cf_cv_main_return:-return}(foo == 0);
-+if (foo + 1234 > 5678)
-+	${cf_cv_main_return:-return}(foo);
- #endif
- 
-   ;
-@@ -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:14470: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13270: \$? = $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:14476: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13276: \$? = $ac_status" >&5
-+  echo "$as_me:14479: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:14495: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <<EOF
-@@ -13299,14 +14502,82 @@
- 	fi
- done
- 
--echo "$as_me:13302: checking for ncurses extended functions" >&5
-+if test x$cf_cv_func_tputs = xyes
-+then
-+	cf_done=no
-+	for cf_arg in int char
-+	do
-+		for cf_ret in int void
-+		do
-+			if test $cf_ret = void
-+			then
-+				cf_return="/* nothing */"
-+			else
-+				cf_return="return value"
-+			fi
-+			cat >conftest.$ac_ext <<_ACEOF
-+#line 14519 "configure"
-+#include "confdefs.h"
-+
-+#include <${cf_cv_ncurses_header:-curses.h}>
-+#include <$cf_cv_term_header>
-+
-+static $cf_ret outc($cf_arg value) { $cf_return; }
-+
-+int
-+main ()
-+{
-+
-+	tputs("hello", 0, outc);
-+	${cf_cv_main_return:-return}(0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14539: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14542: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14545: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  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}:14553: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
-+
-+		cat >>confdefs.h <<EOF
-+#define TPUTS_ARG               $cf_arg
-+#define TPUTS_PROTO(func,value) $cf_ret func(TPUTS_ARG value)
-+#define TPUTS_RETURN(value)     $cf_return
-+EOF
-+		cf_done=yes
-+		break
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+		done
-+		test $cf_done = yes && break
-+	done
-+fi
-+
-+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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13309 "configure"
-+#line 14580 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13321,16 +14592,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13324: \"$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: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:14601: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13333: \$? = $ac_status" >&5
-+  echo "$as_me:14604: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=defined
- else
-@@ -13338,7 +14609,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13341 "configure"
-+#line 14612 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -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:14637: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13369: \$? = $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:14643: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13375: \$? = $ac_status" >&5
-+  echo "$as_me:14646: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=yes
- else
-@@ -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: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
- #define NCURSES_EXT_FUNCS 1
- EOF
- 
--echo "$as_me:13395: checking for wide-character functions" >&5
--echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
--if test "${cf_cv_widechar_funcs+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+if test "$cf_enable_widec" = yes
-+then
-+	# workaround for systems with ncurses before 20111029, due to change of
-+	# feature test macro from _XPG5 to _XOPEN_SOURCE
-+	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
-+	then
-+		cf_define_xpg5=no
-+		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
- 
--cat >conftest.$ac_ext <<_ACEOF
--#line 13402 "configure"
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 14677 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
- main ()
- {
--
--	static wchar_t src_wchar[2];
--	static cchar_t dst_cchar;
--	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13419: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:13422: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:13428: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cf_cv_widechar_funcs=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--cf_cv_widechar_funcs=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--
--fi
--echo "$as_me:13439: result: $cf_cv_widechar_funcs" >&5
--echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
--if test "$cf_cv_widechar_funcs" != no ; then
--	cat >>confdefs.h <<\EOF
--#define USE_WIDEC_SUPPORT 1
--EOF
--
--else
--	cat >>confdefs.h <<\EOF
--#define USE_WIDEC_SUPPORT 0
--EOF
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--                  inttypes.h stdint.h unistd.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13459: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 13465 "configure"
--#include "confdefs.h"
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13471: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:13474: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13477: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:13480: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_Header=yes"
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--eval "$as_ac_Header=no"
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:13490: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
--
--fi
--done
--
--echo "$as_me:13500: checking for pid_t" >&5
--echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
--if test "${ac_cv_type_pid_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 13506 "configure"
--#include "confdefs.h"
--$ac_includes_default
--int
--main ()
--{
--if ((pid_t *) 0)
--  return 0;
--if (sizeof (pid_t))
--  return 0;
-+int x = _XPG5
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13521: \"$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:14693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13530: \$? = $ac_status" >&5
-+  echo "$as_me:14699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_type_pid_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_type_pid_t=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:13540: 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
-   :
- else
--
--cat >>confdefs.h <<EOF
--#define pid_t int
--EOF
--
--fi
--
--for ac_header in unistd.h vfork.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13555: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 13561 "configure"
--#include "confdefs.h"
--#include <$ac_header>
--_ACEOF
--if { (eval echo "$as_me:13565: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:13571: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
--else
-   echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
--fi
--rm -f conftest.err conftest.$ac_ext
--fi
--echo "$as_me:13590: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
--
--fi
--done
--
--for ac_func in fork vfork
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13603: 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 13609 "configure"
-+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.  */
--#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) ();
- 
-+#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
--    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;
--#endif
--
-+int x = _XPG5
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13640: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:13643: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13646: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:13649: \$? = $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:13659: 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
--
--ac_cv_func_fork_works=$ac_cv_func_fork
--if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:13671: 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
--else
--  if test "$cross_compiling" = yes; then
--  ac_cv_func_fork_works=cross
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* By RÃŒdiger Kuhlmann. */
--      #include <sys/types.h>
--      #if HAVE_UNISTD_H
--      # include <unistd.h>
--      #endif
--      /* Some systems only have a dummy stub for fork() */
--      int main ()
--      {
--        if (fork() < 0)
--          $ac_main_return (1);
--        $ac_main_return (0);
--      }
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13694: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+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
-+  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
-+  echo "$as_me:14730: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_fork_works=yes
-+  cf_define_xpg5=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--ac_cv_func_fork_works=no
--fi
--rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+			 CPPFLAGS="$cf_save_cppflags"
- fi
--echo "$as_me:13714: result: $ac_cv_func_fork_works" >&5
--echo "${ECHO_T}$ac_cv_func_fork_works" >&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+		echo "$as_me:14741: result: $cf_define_xpg5" >&5
-+echo "${ECHO_T}$cf_define_xpg5" >&6
- 
--fi
--if test "x$ac_cv_func_fork_works" = xcross; then
--  case $host in
--    *-*-amigaos* | *-*-msdosdjgpp*)
--      # Override, as these systems have only a dummy fork() stub
--      ac_cv_func_fork_works=no
--      ;;
--    *)
--      ac_cv_func_fork_works=yes
--      ;;
--  esac
--  { echo "$as_me:13728: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
--echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
--fi
--ac_cv_func_vfork_works=$ac_cv_func_vfork
--if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:13733: 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
-+		if test "$cf_define_xpg5" = yes
-+		then
-+			CPPFLAGS="$CPPFLAGS -D_XPG5"
-+		fi
-+	fi
-+
-+	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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test "$cross_compiling" = yes; then
--  ac_cv_func_vfork_works=cross
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 13742 "configure"
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 14757 "configure"
- #include "confdefs.h"
--/* Thanks to Paul Eggert for this test.  */
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#if HAVE_UNISTD_H
--# include <unistd.h>
--#endif
--#if HAVE_VFORK_H
--# include <vfork.h>
--#endif
--/* On some sparc systems, changes by the child to local and incoming
--   argument registers are propagated back to the parent.  The compiler
--   is told about this with #include <vfork.h>, but some compilers
--   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
--   static variable whose address is put into a register that is
--   clobbered by the vfork.  */
--static
--#ifdef __cplusplus
--sparc_address_test (int arg)
--# else
--sparc_address_test (arg) int arg;
--#endif
--{
--  static pid_t child;
--  if (!child) {
--    child = vfork ();
--    if (child < 0) {
--      perror ("vfork");
--      _exit(2);
--    }
--    if (!child) {
--      arg = getpid();
--      write(-1, "", 0);
--      _exit (arg);
--    }
--  }
--}
- 
-+#include <${cf_cv_ncurses_header:-curses.h}>
- int
- main ()
- {
--  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);
- 
--  if (child == 0) {
--    /* Here is another test for sparc vfork register problems.  This
--       test uses lots of local variables, at least as many local
--       variables as main has allocated so far including compiler
--       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
--       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
--       reuse the register of parent for one of the local variables,
--       since it will think that parent can't possibly be used any more
--       in this routine.  Assigning to the local variable will thus
--       munge parent in the parent process.  */
--    pid_t
--      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
--      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
--    /* Convince the compiler that p..p7 are live; otherwise, it might
--       use the same hardware register for all 8 local variables.  */
--    if (p != p1 || p != p2 || p != p3 || p != p4
--	|| p != p5 || p != p6 || p != p7)
--      _exit(1);
--
--    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
--       from child file descriptors.  If the child closes a descriptor
--       before it execs or exits, this munges the parent's descriptor
--       as well.  Test for this by closing stdout in the child.  */
--    _exit(close(fileno(stdout)) != 0);
--  } else {
--    int status;
--    struct stat st;
--
--    while (wait(&status) != child)
--      ;
--    $ac_main_return(
--	 /* Was there some problem with vforking?  */
--	 child < 0
--
--	 /* Did the child fail?  (This shouldn't happen.)  */
--	 || status
--
--	 /* Did the vfork/compiler bug occur?  */
--	 || parent != getpid()
--
--	 /* Did the file descriptor bug occur?  */
--	 || fstat(fileno(stdout), &st) != 0
--	 );
--  }
-+  ;
-+  return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13839: \"$ac_link\"") >&5
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14774: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13842: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13844: \"$ac_try\"") >&5
-+  echo "$as_me:14777: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (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:14783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_vfork_works=yes
-+  cf_cv_widechar_funcs=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--ac_cv_func_vfork_works=no
--fi
--rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+cf_cv_widechar_funcs=no
- fi
--echo "$as_me:13859: result: $ac_cv_func_vfork_works" >&5
--echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
--fi;
--if test "x$ac_cv_func_fork_works" = xcross; then
--  ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:13865: 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
--
--if test "x$ac_cv_func_vfork_works" = xyes; then
--
--cat >>confdefs.h <<\EOF
--#define HAVE_WORKING_VFORK 1
-+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
-+		cat >>confdefs.h <<\EOF
-+#define USE_WIDEC_SUPPORT 1
- EOF
- 
--else
--
--cat >>confdefs.h <<\EOF
--#define vfork fork
-+	else
-+		cat >>confdefs.h <<\EOF
-+#define USE_WIDEC_SUPPORT 0
- EOF
- 
--fi
--if test "x$ac_cv_func_fork_works" = xyes; then
--
--cat >>confdefs.h <<\EOF
--#define HAVE_WORKING_FORK 1
-+	fi
-+else
-+	cat >>confdefs.h <<\EOF
-+#define USE_WIDEC_SUPPORT 0
- EOF
- 
- fi
- 
--echo "$as_me:13890: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13897 "configure"
-+#line 14821 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13914,16 +14838,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13917: \"$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: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:14847: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13926: \$? = $ac_status" >&5
-+  echo "$as_me:14850: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -13935,13 +14859,13 @@
- 
- fi
- 
--echo "$as_me:13938: 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
- #define HAVE_SYS_TIME_SELECT 1
- EOF
- 
--echo "$as_me:13944: 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 +14875,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13954 "configure"
-+#line 14878 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13964,15 +14888,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13967: \"$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:14894: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13972: \"$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:14899: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -13987,13 +14911,13 @@
- fi
- rm -f core
- fi
--echo "$as_me:13990: 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
- #define HAVE_CURSES_VERSION 1
- EOF
- 
--echo "$as_me:13996: 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 +14927,10 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--echo "$as_me:14006: 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: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 +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 14943 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -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:14959: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14038: \$? = $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:14965: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14044: \$? = $ac_status" >&5
-+  echo "$as_me:14968: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -14052,14 +14976,16 @@
- done
- 
- fi
--echo "$as_me:14055: 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
- 
- test "$cf_cv_curses_acs_map" != unknown && cat >>confdefs.h <<EOF
- #define CURSES_ACS_ARRAY $cf_cv_curses_acs_map
- EOF
- 
--echo "$as_me:14062: checking for wide alternate character set array" >&5
-+if test "$cf_enable_widec" = yes; then
-+
-+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 +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 14998 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -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:15014: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14091: \$? = $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:15020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14097: \$? = $ac_status" >&5
-+  echo "$as_me:15023: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -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:15034: result: $cf_cv_curses_wacs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
- 
- test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--echo "$as_me:14115: 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 +15048,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14125 "configure"
-+#line 15051 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -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:15068: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14145: \$? = $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:15074: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14151: \$? = $ac_status" >&5
-+  echo "$as_me:15077: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -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 15087 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -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:15103: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14180: \$? = $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:15109: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14186: \$? = $ac_status" >&5
-+  echo "$as_me:15112: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -14194,17 +15120,19 @@
- fi
- 
- fi
--echo "$as_me:14197: 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
- 
- test "$cf_cv_curses_wacs_symbols" != no && cat >>confdefs.h <<\EOF
- #define CURSES_WACS_SYMBOLS 1
- EOF
- 
--echo "$as_me:14204: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+fi
-+
-+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 15135 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14222,16 +15150,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14225: \"$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: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:15159: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14234: \$? = $ac_status" >&5
-+  echo "$as_me:15162: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15171: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -14257,15 +15185,17 @@
- 
- fi
- 
-+if test "$cf_enable_widec" = yes; then
-+
- # 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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14268 "configure"
-+#line 15198 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14283,23 +15213,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14286: \"$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: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:15222: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14295: \$? = $ac_status" >&5
-+  echo "$as_me:15225: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 14302 "configure"
-+#line 15232 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14318,16 +15248,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14321: \"$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: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:15257: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14330: \$? = $ac_status" >&5
-+  echo "$as_me:15260: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14371 "configure"
-+#line 15301 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14386,23 +15316,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14389: \"$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: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:15325: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14398: \$? = $ac_status" >&5
-+  echo "$as_me:15328: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 14405 "configure"
-+#line 15335 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14421,16 +15351,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14424: \"$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: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:15360: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14433: \$? = $ac_status" >&5
-+  echo "$as_me:15363: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -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: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 +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: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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14474 "configure"
-+#line 15404 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14489,23 +15419,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14492: \"$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: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:15428: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14501: \$? = $ac_status" >&5
-+  echo "$as_me:15431: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 14508 "configure"
-+#line 15438 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14524,16 +15454,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14527: \"$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: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:15463: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14536: \$? = $ac_status" >&5
-+  echo "$as_me:15466: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -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: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 +15496,12 @@
- 	NCURSES_OK_WINT_T=1
- fi
- 
--if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
-+	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--echo "$as_me:14571: 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 15504 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14589,16 +15519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14592: \"$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: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:15528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14601: \$? = $ac_status" >&5
-+  echo "$as_me:15531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15540: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -14624,14 +15554,14 @@
- 
- fi
- 
--fi
-+	fi
- 
--if test "$NCURSES_OK_WCHAR_T" = 0 ; then
-+	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--echo "$as_me:14631: 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 15564 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14649,16 +15579,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14652: \"$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: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:15588: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14661: \$? = $ac_status" >&5
-+  echo "$as_me:15591: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15600: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -14684,14 +15614,14 @@
- 
- fi
- 
--fi
-+	fi
- 
--if test "$NCURSES_OK_WINT_T" = 0 ; then
-+	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--echo "$as_me:14691: 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 15624 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14709,16 +15639,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14712: \"$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: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:15648: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14721: \$? = $ac_status" >&5
-+  echo "$as_me:15651: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15660: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -14744,13 +15674,14 @@
- 
- fi
- 
-+	fi
- fi
- 
--echo "$as_me:14749: 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 15684 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14778,16 +15709,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14781: \"$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: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:15718: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14790: \$? = $ac_status" >&5
-+  echo "$as_me:15721: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15730: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -14808,14 +15739,14 @@
- EOF
- 
- else
--	echo "$as_me:14811: 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.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14818 "configure"
-+#line 15749 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -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:15781: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14853: \$? = $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:15787: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14859: \$? = $ac_status" >&5
-+  echo "$as_me:15790: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14868,7 +15799,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14871 "configure"
-+#line 15802 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14893,15 +15824,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14896: \"$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:15830: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14901: \"$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:15835: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15846: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -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: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 15863 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14957,16 +15888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14960: \"$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: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:15897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14969: \$? = $ac_status" >&5
-+  echo "$as_me:15900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:15909: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -14987,14 +15918,14 @@
- EOF
- 
- else
--	echo "$as_me:14990: 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.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14997 "configure"
-+#line 15928 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -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:15960: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15032: \$? = $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:15966: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15038: \$? = $ac_status" >&5
-+  echo "$as_me:15969: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15047,7 +15978,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15050 "configure"
-+#line 15981 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15072,15 +16003,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15075: \"$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:16009: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15080: \"$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:16014: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -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:16025: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -15104,6 +16035,335 @@
- 	fi
- fi
- 
-+LD_RPATH_OPT=
-+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
-+irix*) #(vi
-+	if test "$GCC" = yes; then
-+		LD_RPATH_OPT="-Wl,-rpath,"
-+	else
-+		LD_RPATH_OPT="-rpath "
-+	fi
-+	;;
-+linux*|gnu*|k*bsd*-gnu) #(vi
-+	LD_RPATH_OPT="-Wl,-rpath,"
-+	;;
-+openbsd[2-9].*|mirbsd*) #(vi
-+	LD_RPATH_OPT="-Wl,-rpath,"
-+	;;
-+dragonfly*|freebsd*) #(vi
-+	LD_RPATH_OPT="-rpath "
-+	;;
-+netbsd*) #(vi
-+	LD_RPATH_OPT="-Wl,-rpath,"
-+	;;
-+osf*|mls+*) #(vi
-+	LD_RPATH_OPT="-rpath "
-+	;;
-+solaris2*) #(vi
-+	LD_RPATH_OPT="-R"
-+	;;
-+*)
-+	;;
-+esac
-+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: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 16080 "configure"
-+#include "confdefs.h"
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:16092: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:16095: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:16098: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:16101: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_rpath_space=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_rpath_space=yes
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+	LIBS="$cf_save_LIBS"
-+	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 "
-+	;;
-+esac
-+
-+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
-+
-+# Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-+if test "${enable_rpath_hack+set}" = set; then
-+  enableval="$enable_rpath_hack"
-+  test "$enableval" != no && enableval=yes
-+  if test "$enableval" != "yes" ; then
-+    cf_disable_rpath_hack=yes
-+  else
-+    cf_disable_rpath_hack=no
-+  fi
-+else
-+  enableval=yes
-+  cf_disable_rpath_hack=no
-+
-+fi;
-+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: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:16141: result: maybe" >&5
-+echo "${ECHO_T}maybe" >&6
-+
-+	for ac_prog in ldd
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$cf_ldd_prog"; then
-+  ac_cv_prog_cf_ldd_prog="$cf_ldd_prog" # 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_cf_ldd_prog="$ac_prog"
-+echo "$as_me:16163: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
-+if test -n "$cf_ldd_prog"; then
-+  echo "$as_me:16171: result: $cf_ldd_prog" >&5
-+echo "${ECHO_T}$cf_ldd_prog" >&6
-+else
-+  echo "$as_me:16174: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$cf_ldd_prog" && break
-+done
-+test -n "$cf_ldd_prog" || cf_ldd_prog="no"
-+
-+	cf_rpath_list="/usr/lib /lib"
-+	if test "$cf_ldd_prog" != no
-+	then
-+		cf_rpath_oops=
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 16188 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("Hello");
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:16203: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  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`
-+		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+		# If we passed the link-test, but get a "not found" on a given library,
-+		# this could be due to inept reconfiguration of gcc to make it only
-+		# partly honor /usr/local/lib (or whatever).  Sometimes this behavior
-+		# is intentional, e.g., installing gcc in /usr/bin and suppressing the
-+		# /usr/local libraries.
-+		if test -n "$cf_rpath_oops"
-+		then
-+			for cf_rpath_src in $cf_rpath_oops
-+			do
-+				for cf_rpath_dir in \
-+					/usr/local \
-+					/usr/pkg \
-+					/opt/sfw
-+				do
-+					if test -f $cf_rpath_dir/lib/$cf_rpath_src
-+					then
-+						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
-+
-+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"
-+						break
-+					fi
-+				done
-+			done
-+		fi
-+	fi
-+
-+	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-+
-+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}:16253: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+
-+cf_rpath_dst=
-+for cf_rpath_src in $LDFLAGS
-+do
-+	case $cf_rpath_src in #(vi
-+	-L*) #(vi
-+
-+		# check if this refers to a directory which we will ignore
-+		cf_rpath_skip=no
-+		if test -n "$cf_rpath_list"
-+		then
-+			for cf_rpath_item in $cf_rpath_list
-+			do
-+				if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
-+				then
-+					cf_rpath_skip=yes
-+					break
-+				fi
-+			done
-+		fi
-+
-+		if test "$cf_rpath_skip" = no
-+		then
-+			# transform the option
-+			if test "$LD_RPATH_OPT" = "-R " ; then
-+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"`
-+			else
-+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"`
-+			fi
-+
-+			# if we have not already added this, add it now
-+			cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
-+			if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
-+			then
-+				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-+
-+echo "${as_me:-configure}:16290: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+
-+				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-+			fi
-+		fi
-+		;;
-+	esac
-+	cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-+done
-+LDFLAGS=$cf_rpath_dst
-+
-+test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
-+
-+echo "${as_me:-configure}:16303: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+
-+test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
-+
-+echo "${as_me:-configure}:16307: testing ...checking LIBS $LIBS ..." 1>&5
-+
-+cf_rpath_dst=
-+for cf_rpath_src in $LIBS
-+do
-+	case $cf_rpath_src in #(vi
-+	-L*) #(vi
-+
-+		# check if this refers to a directory which we will ignore
-+		cf_rpath_skip=no
-+		if test -n "$cf_rpath_list"
-+		then
-+			for cf_rpath_item in $cf_rpath_list
-+			do
-+				if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
-+				then
-+					cf_rpath_skip=yes
-+					break
-+				fi
-+			done
-+		fi
-+
-+		if test "$cf_rpath_skip" = no
-+		then
-+			# transform the option
-+			if test "$LD_RPATH_OPT" = "-R " ; then
-+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"`
-+			else
-+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"`
-+			fi
-+
-+			# if we have not already added this, add it now
-+			cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
-+			if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
-+			then
-+				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-+
-+echo "${as_me:-configure}:16344: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+
-+				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-+			fi
-+		fi
-+		;;
-+	esac
-+	cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-+done
-+LIBS=$cf_rpath_dst
-+
-+test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
-+
-+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}:16361: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+
-+fi
-+
-+fi
-+
- TEST_ARGS="$LIBS"
- LIBS=
- 
-@@ -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:16451: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -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: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 +16643,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:15386: 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;}
-@@ -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:16696: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -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
- s,@MATH_LIB@,$MATH_LIB,;t t
-+s,@top_builddir@,$top_builddir,;t t
- s,@CC_G_OPT@,$CC_G_OPT,;t t
- s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
- s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
-@@ -15561,7 +16825,8 @@
- s,@TEST_ARGS@,$TEST_ARGS,;t t
- s,@TEST_DEPS@,$TEST_DEPS,;t t
- s,@TEST_LIBS@,$TEST_LIBS,;t t
--s,@TINFO_ARGS@,$TINFO_ARGS,;t t
-+s,@TINFO_LDFLAGS@,$TINFO_LDFLAGS,;t t
-+s,@TINFO_LIBS@,$TINFO_LIBS,;t t
- s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t
- s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t
- s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
-@@ -15572,6 +16837,7 @@
- s,@ECHO_CC@,$ECHO_CC,;t t
- s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
- s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
-+s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
- s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s,@X_CFLAGS@,$X_CFLAGS,;t t
-@@ -15579,7 +16845,10 @@
- s,@X_LIBS@,$X_LIBS,;t t
- s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
- s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t
-+s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t
- s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
-+s,@cf_ldd_prog@,$cf_ldd_prog,;t t
-+s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
- CEOF
- 
- EOF
-@@ -15694,7 +16963,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:15697: 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 +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: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 +16994,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15728: 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 +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: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 +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: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 +17084,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15818: 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 +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: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-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***************************************************************************
--dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1996, etc.
- dnl
--dnl $Id: configure.in,v 1.90 2011/03/22 09:15:08 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
- dnl system (i.e., sysvr4 curses)
-@@ -60,6 +60,7 @@
- AC_SUBST(MATH_LIB)
- 
- dnl Things that we don't need (or must override) if we're not building ncurses
-+CF_TOP_BUILDDIR
- CC_G_OPT="-g"					AC_SUBST(CC_G_OPT)
- CC_SHARED_OPTS=unknown			AC_SUBST(CC_SHARED_OPTS)
- CPPFLAGS="$CPPFLAGS"			AC_SUBST(CPPFLAGS)
-@@ -81,7 +82,8 @@
- TEST_ARGS=""					AC_SUBST(TEST_ARGS)
- TEST_DEPS=""					AC_SUBST(TEST_DEPS)
- TEST_LIBS=""					AC_SUBST(TEST_LIBS)
--TINFO_ARGS='$(LIBS_CURSES)'		AC_SUBST(TINFO_ARGS)
-+TINFO_LDFLAGS=''				AC_SUBST(TINFO_LDFLAGS)
-+TINFO_LIBS='$(LIBS_CURSES)'		AC_SUBST(TINFO_LIBS)
- cf_cv_abi_version=""			AC_SUBST(cf_cv_abi_version)
- cf_cv_rel_version=""			AC_SUBST(cf_cv_rel_version)
- 
-@@ -101,45 +103,27 @@
- CF_ENABLE_WARNINGS
- 
- CF_DISABLE_LEAKS
--CF_WITH_CURSES_DIR
- 
--dnl SunOS 4.x
--AC_ARG_WITH(5lib,
--	[  --with-5lib             use SunOS sysv-libraries],
--	[LIBS="-L/usr/5lib $LIBS"
--	 CPPFLAGS="$CPPFLAGS -I/usr/5include"])
-+dnl ---------------------------------------------------------------------------
-+AC_MSG_CHECKING(if you want to check for wide-character functions)
-+CF_ARG_DISABLE(widec,
-+	[  --disable-widec           disable checks for wide-character functions],
-+	cf_enable_widec=no,
-+	cf_enable_widec=yes,
-+	yes)
-+AC_MSG_RESULT($cf_enable_widec)
-+
- 
- dnl ---------------------------------------------------------------------------
--dnl NcursesW, installed in conventional location
--AC_ARG_WITH(ncursesw,
--	[  --with-ncursesw         use wide ncurses-libraries (installed)],
--	[cf_cv_screen=ncursesw],[
--
--dnl Ncurses, installed in conventional location
--AC_ARG_WITH(ncurses,
--	[  --with-ncurses          use ncurses-libraries (installed)],
--	[cf_cv_screen=ncurses],[
--
--AC_ARG_WITH(pdcurses,
--	[  --with-pdcurses         compile/link with pdcurses X11 library],
--	[cf_cv_screen=pdcurses])])])
-+CF_WITH_NCURSES_ETC
- 
- case $cf_cv_screen in
--curses)
--	CF_CURSES_CONFIG
-+curses|curses_*)
- 	CF_NETBSD_FORM_H
- 	CF_NETBSD_MENU_H
- 	;;
--ncurses)
--	CF_NCURSES_CONFIG
--	;;
- ncursesw)
- 	cf_cv_libtype=w
--	CF_UTF8_LIB
--	CF_NCURSES_CONFIG(ncursesw)
--	;;
--pdcurses) #(vi
--	CF_PDCURSES_X11
- 	;;
- esac
- 
-@@ -185,20 +169,28 @@
- unistd.h \
- )
- 
-+CF_GETOPT_HEADER
-+
- AC_CHECK_FUNCS( \
- gettimeofday \
-+strdup \
-+)
-+
-+if test "$cf_enable_widec" = yes; then
-+AC_CHECK_FUNCS( \
- mblen \
- mbrlen \
- mbrtowc \
- mbsrtowcs \
- mbstowcs \
- mbtowc \
--strdup \
- wcsrtombs \
- wcstombs \
- )
-+fi
- 
- CF_CURSES_FUNCS( \
-+assume_default_colors \
- chgat \
- color_set \
- filter \
-@@ -225,61 +217,100 @@
- tigetstr \
- typeahead \
- use_default_colors \
--vw_printw \
-+use_screen \
-+use_window \
- vsscanf \
-+vw_printw \
- wchgat \
- winsstr \
- wresize \
- wsyncdown \
- )
- 
-+CF_TPUTS_PROTO
- CF_NCURSES_EXT_FUNCS
- 
--AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
--AC_TRY_LINK([
-+if test "$cf_enable_widec" = yes
-+then
-+	# workaround for systems with ncurses before 20111029, due to change of
-+	# feature test macro from _XPG5 to _XOPEN_SOURCE
-+	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
-+	then
-+		cf_define_xpg5=no
-+		AC_MSG_CHECKING(if _XPG5 should be defined to enable wide-characters)
-+
-+		AC_TRY_COMPILE([
-+#include <${cf_cv_ncurses_header:-curses.h}>],
-+			[int x = _XPG5],,
-+			[cf_save_cppflags="$CPPFLAGS"
-+			 CPPFLAGS="$CPPFLAGS -D_XPG5"
-+			 AC_TRY_COMPILE([
-+#include <${cf_cv_ncurses_header:-curses.h}>],
-+				[int x = _XPG5],
-+				[cf_define_xpg5=yes])
-+			 CPPFLAGS="$cf_save_cppflags"])
-+		AC_MSG_RESULT($cf_define_xpg5)
-+
-+		if test "$cf_define_xpg5" = yes
-+		then
-+			CPPFLAGS="$CPPFLAGS -D_XPG5"
-+		fi
-+	fi
-+
-+	AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
-+	AC_TRY_LINK([
- #include <${cf_cv_ncurses_header:-curses.h}>],
--[
--	static wchar_t src_wchar[2];
--	static cchar_t dst_cchar;
--	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
--	],
--	[cf_cv_widechar_funcs=yes],
--	[cf_cv_widechar_funcs=no])
--])
--if test "$cf_cv_widechar_funcs" != no ; then
--	AC_DEFINE(USE_WIDEC_SUPPORT,1)
-+	[
-+		static wchar_t src_wchar[2];
-+		static cchar_t dst_cchar;
-+		setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
-+		],
-+		[cf_cv_widechar_funcs=yes],
-+		[cf_cv_widechar_funcs=no])
-+	])
-+	if test "$cf_cv_widechar_funcs" != no ; then
-+		AC_DEFINE(USE_WIDEC_SUPPORT,1)
-+	else
-+		AC_DEFINE(USE_WIDEC_SUPPORT,0)
-+	fi
- else
- 	AC_DEFINE(USE_WIDEC_SUPPORT,0)
- fi
- 
--AC_FUNC_VFORK
- CF_SYS_TIME_SELECT
- CF_FUNC_CURSES_VERSION
- CF_CURSES_ACS_MAP
--CF_CURSES_WACS_MAP
--CF_CURSES_WACS_SYMBOLS
- 
--CF_CURSES_CHECK_TYPE(attr_t,long)
--
--CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T)
--CF_WCHAR_TYPE(wchar_t,   NCURSES_WCHAR_T,   NCURSES_OK_WCHAR_T)
--CF_WCHAR_TYPE(wint_t,    NCURSES_WINT_T,    NCURSES_OK_WINT_T)
--
--if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
--	CF_CURSES_CHECK_TYPE(mbstate_t,long)
-+if test "$cf_enable_widec" = yes; then
-+	CF_CURSES_WACS_MAP
-+	CF_CURSES_WACS_SYMBOLS
- fi
- 
--if test "$NCURSES_OK_WCHAR_T" = 0 ; then
--	CF_CURSES_CHECK_TYPE(wchar_t,long)
--fi
-+CF_CURSES_CHECK_TYPE(attr_t,long)
- 
--if test "$NCURSES_OK_WINT_T" = 0 ; then
--	CF_CURSES_CHECK_TYPE(wint_t,long)
-+if test "$cf_enable_widec" = yes; then
-+	CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T)
-+	CF_WCHAR_TYPE(wchar_t,   NCURSES_WCHAR_T,   NCURSES_OK_WCHAR_T)
-+	CF_WCHAR_TYPE(wint_t,    NCURSES_WINT_T,    NCURSES_OK_WINT_T)
-+
-+	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
-+		CF_CURSES_CHECK_TYPE(mbstate_t,long)
-+	fi
-+
-+	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
-+		CF_CURSES_CHECK_TYPE(wchar_t,long)
-+	fi
-+
-+	if test "$NCURSES_OK_WINT_T" = 0 ; then
-+		CF_CURSES_CHECK_TYPE(wint_t,long)
-+	fi
- fi
- 
- CF_CURSES_CHECK_DATA(boolnames)
- CF_CURSES_CHECK_DATA(boolfnames)
- 
-+CF_DISABLE_RPATH_HACK
-+
- TEST_ARGS="$LIBS"
- 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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_menus.c,v 1.32 2011/01/15 20:02:47 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 @@
- {
-     static const char *const tbl[] =
-     {
--	"Usage: demo_menus [options]"
-+	"Usage: demo_menus [options] [menu-file]"
- 	,""
- 	,"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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2011 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 (1998-on)
-  *
-- * $Id: ditto.c,v 1.40 2010/11/14 01:06:47 tom Exp $
-+ * $Id: ditto.c,v 1.41 2011/05/21 18:55:07 tom Exp $
-  *
-  * The program illustrates how to set up multiple screens from a single
-  * program.
-@@ -98,6 +98,9 @@
-     DITTO *ditto;		/* data for all screens */
- } DDATA;
- 
-+static void failed(const char *) GCC_NORETURN;
-+static void usage(void) GCC_NORETURN;
-+
- static void
- failed(const char *s)
- {
-diff -Naur ncurses-5.9.orig/test/dots.c ncurses-5.9/test/dots.c
---- 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 @@
- /*
-  * Author: Thomas E. Dickey <dickey@clark.net> 1999
-  *
-- * $Id: dots.c,v 1.22 2010/11/14 01:00:02 tom Exp $
-+ * $Id: dots.c,v 1.23 2011/04/23 19:15:04 tom Exp $
-  *
-  * A simple demo of the terminfo interface.
-  */
-@@ -46,8 +46,8 @@
- static long total_chars = 0;
- static time_t started;
- 
--static int
--outc(TPUTS_ARG c)
-+static
-+TPUTS_PROTO(outc, c)
- {
-     int rc = c;
- 
-@@ -58,7 +58,7 @@
-     } else {
- 	rc = putc(c, stdout);
-     }
--    return rc;
-+    TPUTS_RETURN(rc);
- }
- 
- 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-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 @@
- /*
-  * Author: Thomas E. Dickey - 2007
-  *
-- * $Id: dots_mvcur.c,v 1.6 2010/11/14 01:00:44 tom Exp $
-+ * $Id: dots_mvcur.c,v 1.7 2011/04/23 19:17:20 tom Exp $
-  *
-  * A simple demo of the terminfo interface, and mvcur.
-  */
-@@ -46,8 +46,8 @@
- static long total_chars = 0;
- static time_t started;
- 
--static int
--outc(TPUTS_ARG c)
-+static
-+TPUTS_PROTO(outc, c)
- {
-     int rc = c;
- 
-@@ -59,7 +59,7 @@
- 	if (putc(c, stdout) == EOF)
- 	    rc = EOF;
-     }
--    return rc;
-+    TPUTS_RETURN(rc);
- }
- 
- 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-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-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 <dickey@clark.net> 1998
-  *
-- * $Id: filter.c,v 1.13 2010/11/13 20:55:54 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();
- 	printf("\n");
- 	fflush(stdout);
--	system(buffer);
-+	IGNORE_RC(system(buffer));
- 	reset_prog_mode();
- 	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-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.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: ins_wide.c,v 1.15 2010/12/12 00:20:14 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.
-  * Thomas Dickey - 2002/11/23
-@@ -228,8 +228,9 @@
-     WINDOW *work = 0;
-     WINDOW *show = 0;
-     int margin = (2 * MY_TABSIZE) - 1;
--    Options option = ((m_opt ? oMove : oDefault)
--		      | ((w_opt || (level > 0)) ? oWindow : oDefault));
-+    Options option = (Options) ((int) (m_opt ? oMove : oDefault)
-+				| (int) ((w_opt || (level > 0))
-+					 ? oWindow : oDefault));
- 
-     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-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 @@
- /****************************************************************************
-- * 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,18 +26,22 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: movewindow.c,v 1.24 2010/11/13 23:34:55 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
-  * library.
-  *
-- * Thomas Dickey - 2006/2/11
-+ * Author: Thomas E. Dickey
-  */
- /*
- derwin
- mvderwin
- subwin
- mvwin
-+
-+TODO:
-+    add command to reset subwindow's origin to coincide with parent.
-+    add command to delete subwindow (check if it has subwindows though)
-  */
- 
- #include <test.priv.h>
-@@ -122,7 +126,12 @@
-  * Arrow keys move cursor, return location at current on non-arrow key.
-  */
- static PAIR *
--selectcell(WINDOW *parent, int uli, int ulj, int lri, int lrj)
-+selectcell(WINDOW *parent,
-+	   WINDOW *child,
-+	   int uli, int ulj,
-+	   int lri, int lrj,
-+	   bool relative,
-+	   bool * more)
- {
-     static PAIR res;		/* result cell */
-     int si = lri - uli + 1;	/* depth of the select area */
-@@ -131,25 +140,46 @@
- 
-     res.y = uli;
-     res.x = ulj;
-+
-+    if (child != 0) {
-+	if (relative) {
-+	    getparyx(child, i, j);
-+	} else {
-+	    getbegyx(child, i, j);
-+	    i -= uli + getbegy(parent);
-+	    j -= ulj + getbegx(parent);
-+	}
-+    }
-+
-+    if (more)
-+	*more = FALSE;
-+
-     for (;;) {
--	tail_line("Upper left [%2d,%2d] Lower right [%2d,%2d] -> %d,%d",
-+	bool moved = FALSE;
-+
-+	tail_line("Upper left [%2d,%2d] Lower right [%2d,%2d] -> %d,%d -> %d,%d",
- 		  uli, ulj,
- 		  lri, lrj,
-+		  i, j,
- 		  uli + i, ulj + j);
- 	wmove(parent, uli + i, ulj + j);
- 
- 	switch (wgetch(parent)) {
- 	case KEY_UP:
- 	    i += si - 1;
-+	    moved = TRUE;
- 	    break;
- 	case KEY_DOWN:
- 	    i++;
-+	    moved = TRUE;
- 	    break;
- 	case KEY_LEFT:
- 	    j += sj - 1;
-+	    moved = TRUE;
- 	    break;
- 	case KEY_RIGHT:
- 	    j++;
-+	    moved = TRUE;
- 	    break;
- 	case QUIT:
- 	case ESCAPE:
-@@ -161,8 +191,14 @@
- 
- 		getmouse(&event);
- 		if (event.y > uli && event.x > ulj) {
--		    i = event.y - uli;
--		    j = event.x - ulj;
-+		    if (parent != stdscr) {
-+			i = event.y - getbegy(parent) - uli;
-+			j = event.x - getbegx(parent) - ulj;
-+		    } else {
-+			i = event.y - uli;
-+			j = event.x - ulj;
-+		    }
-+		    moved = TRUE;
- 		} else {
- 		    beep();
- 		    break;
-@@ -177,6 +213,16 @@
- 	}
- 	i %= si;
- 	j %= sj;
-+
-+	/*
-+	 * If the caller can handle continuous movement, return the result.
-+	 */
-+	if (moved && more) {
-+	    *more = TRUE;
-+	    res.y = uli + i;
-+	    res.x = ulj + j;
-+	    return (&res);
-+	}
-     }
- }
- 
-@@ -194,12 +240,20 @@
-     bool result = FALSE;
- 
-     head_line("Use arrows to move cursor, anything else to mark corner 1");
--    if ((tmp = selectcell(parent, min_line, min_col, max_line, max_col)) != 0) {
-+    if ((tmp = selectcell(parent, 0,
-+			  min_line, min_col,
-+			  max_line, max_col,
-+			  FALSE,
-+			  (bool *) 0)) != 0) {
- 	*ul = *tmp;
- 	MvWAddCh(parent, ul->y, ul->x, '*');
- 
- 	head_line("Use arrows to move cursor, anything else to mark corner 2");
--	if ((tmp = selectcell(parent, ul->y, ul->x, max_line, max_col)) != 0) {
-+	if ((tmp = selectcell(parent, 0,
-+			      ul->y, ul->x,
-+			      max_line, max_col,
-+			      FALSE,
-+			      (bool *) 0)) != 0) {
- 	    *lr = *tmp;
- 	    MvWAddCh(parent, lr->y, lr->x, '*');
- 	    wmove(parent, lr->y, lr->x);
-@@ -341,10 +395,7 @@
- 
-     for (n = 0; n < num_windows; ++n) {
- 	if (all_windows[n].parent == parent) {
--	    int y0, x0;
--
--	    getbegyx(all_windows[n].child, y0, x0);
--	    mvwin(all_windows[n].child, y0 + dy, x0 + dx);
-+	    mvwin(all_windows[n].child, dy, dx);
- 	    recur_move_window(all_windows[n].child, dy, dx);
- 	}
-     }
-@@ -366,20 +417,24 @@
- 	int min_line = top ? LINE_MIN : 0;
- 	int max_line = top ? LINE_MAX : getmaxy(parent);
- 	PAIR *tmp;
-+	bool more;
- 
- 	head_line("Select new position for %swindow", top ? "" : "sub");
- 
--	if ((tmp = selectcell(parent,
--			      min_line, min_col,
--			      max_line, max_col)) != 0) {
-+	while ((tmp = selectcell(parent,
-+				 win,
-+				 min_line, min_col,
-+				 max_line, max_col,
-+				 FALSE,
-+				 &more)) != 0) {
- 	    int y0, x0;
- 	    getbegyx(parent, y0, x0);
- 	    /*
--	     * Note:  Moving a subwindow has the effect of moving a viewport
--	     * around the screen.  The parent window retains the contents of
--	     * the subwindow in the original location, but the viewport will
--	     * show the contents (again) at the new location.  So it will look
--	     * odd when testing.
-+	     * Moving a subwindow has the effect of moving a viewport around
-+	     * the screen.  The parent window retains the contents of the
-+	     * subwindow in the original location, but the viewport will show
-+	     * the contents (again) at the new location.  So it will look odd
-+	     * when testing.
- 	     */
- 	    if (mvwin(win, y0 + tmp->y, x0 + tmp->x) != ERR) {
- 		if (recur) {
-@@ -388,17 +443,34 @@
- 		refresh_all(win);
- 		doupdate();
- 		result = TRUE;
-+	    } else {
-+		result = FALSE;
- 	    }
-+	    if (!more)
-+		break;
- 	}
-     }
-+    head_line("done");
-     return result;
- }
- 
-+static void
-+show_derwin(WINDOW *win)
-+{
-+    int pary, parx, maxy, maxx;
-+
-+    getmaxyx(win, maxy, maxx);
-+    getparyx(win, pary, parx);
-+
-+    head_line("Select new position for derived window at %d,%d (%d,%d)",
-+	      pary, parx, maxy, maxx);
-+}
-+
- /*
-  * test mvderwin().
-  */
- static bool
--move_subwin(WINDOW *win)
-+move_derwin(WINDOW *win)
- {
-     WINDOW *parent = parent_of(win);
-     bool result = FALSE;
-@@ -411,22 +483,31 @@
- 	    int min_line = top ? LINE_MIN : 0;
- 	    int max_line = top ? LINE_MAX : getmaxy(parent);
- 	    PAIR *tmp;
-+	    bool more;
- 
--	    head_line("Select new position for subwindow");
--
--	    if ((tmp = selectcell(parent,
--				  min_line, min_col,
--				  max_line, max_col)) != 0) {
--		int y0, x0;
--		getbegyx(parent, y0, x0);
--		if (mvderwin(win, y0 + tmp->y, x0 + tmp->x) != ERR) {
-+	    show_derwin(win);
-+	    while ((tmp = selectcell(parent,
-+				     win,
-+				     min_line, min_col,
-+				     max_line, max_col,
-+				     TRUE,
-+				     &more)) != 0) {
-+		if (mvderwin(win, tmp->y, tmp->x) != ERR) {
- 		    refresh_all(win);
- 		    doupdate();
-+		    repaint_one(win);
-+		    doupdate();
- 		    result = TRUE;
-+		    show_derwin(win);
-+		} else {
-+		    flash();
- 		}
-+		if (!more)
-+		    break;
- 	    }
- 	}
-     }
-+    head_line("done");
-     return result;
- }
- 
-@@ -449,6 +530,28 @@
-     wrefresh(win);
- }
- 
-+static void
-+fill_with_pattern(WINDOW *win)
-+{
-+    int y, x;
-+    int y0, x0;
-+    int y1, x1;
-+    int ch = 'a';
-+
-+    getyx(win, y0, x0);
-+    getmaxyx(win, y1, x1);
-+    for (y = 0; y < y1; ++y) {
-+	for (x = 0; x < x1; ++x) {
-+	    MvWAddCh(win, y, x, (chtype) ch);
-+	    if (++ch > 'z')
-+		ch = 'a';
-+	}
-+    }
-+    wsyncdown(win);
-+    wmove(win, y0, x0);
-+    wrefresh(win);
-+}
-+
- #define lines_of(ul,lr)	(lr.y - ul.y + 1)
- #define cols_of(ul,lr)	(lr.x - ul.x + 1)
- #define pair_of(ul)	ul.y, ul.x
-@@ -523,12 +626,13 @@
- 	{ 'b',		"Draw a box inside the current window" },
- 	{ 'c',		"Create a new window" },
- 	{ 'd',		"Create a new derived window" },
-+	{ 'D',		"Move derived window (moves viewport)" },
- 	{ 'f',		"Fill the current window with the next character" },
-+	{ 'F',		"Fill the current window with a pattern" },
- 	{ 'm',		"Move the current window" },
- 	{ 'M',		"Move the current window (and its children)" },
- 	{ 'q',		"Quit" },
- 	{ 's',		"Create a new subwindow" },
--	{ 't',		"Move the current subwindow (moves content)" },
- 	{ CTRL('L'),	"Repaint all windows, doing current one last" },
- 	{ CTRL('N'),	"Cursor to next window" },
- 	{ CTRL('P'),	"Cursor to previous window" },
-@@ -571,6 +675,10 @@
- #endif /* NCURSES_MOUSE_VERSION */
- 
-     while (!done && (ch = wgetch(current_win)) != ERR) {
-+	int y, x;
-+
-+	getyx(current_win, y, x);
-+
- 	switch (ch) {
- 	case '?':
- 	    show_help(current_win);
-@@ -584,9 +692,18 @@
- 	case 'd':
- 	    current_win = create_my_derwin(current_win);
- 	    break;
-+	case 'D':
-+	    if (!move_derwin(current_win)) {
-+		tail_line("error");
-+		continue;
-+	    }
-+	    break;
- 	case 'f':
- 	    fill_window(current_win, (chtype) wgetch(current_win));
- 	    break;
-+	case 'F':
-+	    fill_with_pattern(current_win);
-+	    break;
- 	case 'm':
- 	case 'M':
- 	    if (!move_window(current_win, (ch == 'M'))) {
-@@ -600,12 +717,6 @@
- 	case 's':
- 	    current_win = create_my_subwin(current_win);
- 	    break;
--	case 't':
--	    if (!move_subwin(current_win)) {
--		tail_line("error");
--		continue;
--	    }
--	    break;
- 	case CTRL('L'):
- 	    refresh_all(current_win);
- 	    break;
-@@ -621,6 +732,7 @@
- 	    /* want to allow deleting a window also */
- #endif
- 	default:
-+	    wmove(current_win, y, x);
- 	    tail_line("unrecognized key (use '?' for help)");
- 	    beep();
- 	    continue;
-diff -Naur ncurses-5.9.orig/test/ncurses.c ncurses-5.9/test/ncurses.c
---- 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
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.365 2011/01/22 19:48:33 tom Exp $
-+$Id: ncurses.c,v 1.373 2012/07/21 17:40:21 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -490,7 +490,7 @@
- #ifdef __MINGW32__
-     system("cmd.exe");
- #else
--    system("sh");
-+    IGNORE_RC(system("sh"));
- #endif
-     if (message)
- 	addstr("returned from shellout.\n");
-@@ -777,12 +777,21 @@
-     }
-     doupdate();
- }
--#endif	/* resize_boxes */
-+#endif /* resize_boxes */
- #else
- #define forget_boxes()		/* nothing */
- #define remember_boxes(level,text,frame)	/* nothing */
- #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)");
- 	} else {
--	    if (ncv > 0 && (getbkgd(stdscr) & A_COLOR)) {
-+	    if (ncv > 0 && stdscr && (getbkgd(stdscr) & A_COLOR)) {
- 		static const chtype table[] =
- 		{
- 		    A_STANDOUT,
-@@ -1675,8 +1686,8 @@
- 	    add_wch(&ch);
- 	}
-     } else {
--	attr_t old_attr;
--	short old_pair;
-+	attr_t old_attr = 0;
-+	short old_pair = 0;
- 
- 	(void) attr_get(&old_attr, &old_pair, 0);
- 	(void) attr_set(attr, pair, 0);
-@@ -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.
- 	     */
- 	    getyx(stdscr, y, x);
-+	    (void) y;
- 	    if (x >= col + (COLS / 2) - 2)
- 		break;
- 	} while (--count > 0);
-@@ -4269,8 +4281,10 @@
- 
- 		    neww->next = current ? current->next : 0;
- 		    neww->last = current;
--		    neww->last->next = neww;
--		    neww->next->last = neww;
-+		    if (neww->last != 0)
-+			neww->last->next = neww;
-+		    if (neww->next != 0)
-+			neww->next->last = neww;
- 
- 		    neww->wind = getwin(fp);
- 
-@@ -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;
- 	}
--#if NCURSES_VERSION_PATCH >= 20000708
-+#if HAVE_ASSUME_DEFAULT_COLORS
- 	if (assumed_colors)
- 	    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-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 @@
- /*
-  * Author: Thomas E. Dickey - 2000
-  *
-- * $Id: railroad.c,v 1.19 2009/10/24 21:37:56 tom Exp $
-+ * $Id: railroad.c,v 1.20 2011/04/23 19:15:04 tom Exp $
-  *
-  * A simple demo of the termcap interface.
-  */
-@@ -55,8 +55,8 @@
- 
- static bool interrupted = FALSE;
- 
--static int
--outc(TPUTS_ARG c)
-+static
-+TPUTS_PROTO(outc, c)
- {
-     int rc = OK;
- 
-@@ -68,7 +68,7 @@
- 	if (putc(c, stdout) == EOF)
- 	    rc = ERR;
-     }
--    return rc;
-+    TPUTS_RETURN(rc);
- }
- 
- 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-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 @@
- /****************************************************************************
-- * 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            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: rain.c,v 1.38 2010/11/13 20:11:46 tom Exp $
-+ * $Id: rain.c,v 1.40 2012/01/21 23:54:47 tom Exp $
-  */
- #include <test.priv.h>
- 
-@@ -222,7 +222,7 @@
-      * Find myself in the list of threads so we can count the number of loops.
-      */
-     for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
--#ifdef __MINGW32__
-+#if defined(__MINGW32__) && !defined(__WINPTHREADS_VERSION)
- 	if (drop_threads[mystats].myself.p == pthread_self().p)
- #else
- 	if (drop_threads[mystats].myself == pthread_self())
-@@ -256,7 +256,7 @@
- /*
-  * The description of pthread_create() is misleading, since it implies that
-  * threads will exit cleanly after their function returns.
-- * 
-+ *
-  * Since they do not (and the number of threads is limited by system
-  * resources), make a limited number of threads, and signal any that are
-  * 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-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 @@
- /****************************************************************************
-- * Copyright (c) 2006-2007,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2006-2010,2011 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: redraw.c,v 1.5 2010/05/01 22:04:08 tom Exp $
-+ * $Id: redraw.c,v 1.7 2011/05/21 18:38:35 tom Exp $
-  *
-  * Demonstrate the redrawwin() and wredrawln() functions.
-  * Thomas Dickey - 2006/11/4
-@@ -71,7 +71,7 @@
-     keypad(win, TRUE);
-     getmaxyx(win, max_y, max_x);
-     getbegyx(win, beg_y, beg_x);
--    while (!done) {
-+    while (!done && win != 0) {
- 	ch = wgetch(win);
- 	getyx(win, y, x);
- 	switch (ch) {
-@@ -113,7 +113,7 @@
- 	     * using mvcur().  It is ifdef'd for NCURSES, since X/Open does
- 	     * not define the case where the old location is unknown. 
- 	     */
--	    system("date");
-+	    IGNORE_RC(system("date"));
- 	    mvcur(-1, -1, y, x);
- 	    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-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 @@
- /****************************************************************************
-  *  Author: Thomas E. Dickey                    1996-on                     *
-  ****************************************************************************/
--/* $Id: test.priv.h,v 1.103 2011/03/22 09:15:45 tom Exp $ */
-+/* $Id: test.priv.h,v 1.114 2011/10/29 19:59:55 tom Exp $ */
- 
- #ifndef __TEST_PRIV_H
- #define __TEST_PRIV_H 1
-@@ -58,6 +58,10 @@
- /*
-  * Fallback definitions to accommodate broken compilers.
-  */
-+#ifndef HAVE_ASSUME_DEFAULT_COLORS
-+#define HAVE_ASSUME_DEFAULT_COLORS 0
-+#endif
-+
- #ifndef HAVE_CURSES_VERSION
- #define HAVE_CURSES_VERSION 0
- #endif
-@@ -202,6 +206,14 @@
- #define HAVE_USE_DEFAULT_COLORS 0
- #endif
- 
-+#ifndef HAVE_USE_SCREEN
-+#define HAVE_USE_SCREEN 0
-+#endif
-+
-+#ifndef HAVE_USE_WINDOW
-+#define HAVE_USE_WINDOW 0
-+#endif
-+
- #ifndef HAVE_WRESIZE
- #define HAVE_WRESIZE 0
- #endif
-@@ -222,6 +234,13 @@
- #define NO_LEAKS 0
- #endif
- 
-+/*
-+ * Workaround for HPUX
-+ */
-+#if defined(__hpux) && !defined(NCURSES_VERSION)
-+#define _ACS_COMPAT_CODE	/* needed for acs_map vs __acs_map */
-+#endif
-+
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
-@@ -269,21 +288,18 @@
- 
- /*
-  * Not all curses.h implementations include unctrl.h,
-- * Solaris 10 xpg4 for example.
-  */
--#if defined(NCURSES_VERSION) || defined(_XOPEN_CURSES)
--#if defined(HAVE_NCURSESW_NCURSES_H)
-+#if defined(HAVE_NCURSESW_UNCTRL_H)
- #include <ncursesw/unctrl.h>
--#elif defined(HAVE_NCURSES_NCURSES_H)
-+#elif defined(HAVE_NCURSES_UNCTRL_H)
- #include <ncurses/unctrl.h>
--#else
-+#elif defined(HAVE_UNCTRL_H)
- #include <unctrl.h>
- #endif
--#endif
- 
- #if HAVE_GETOPT_H
- #include <getopt.h>
--#else
-+#elif !defined(HAVE_GETOPT_HEADER)
- /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its variables
-  * doesn't hurt.
-  */
-@@ -323,17 +339,20 @@
- #endif
- 
- #if !USE_SOFTKEYS
--#define slk_init() /* nothing */
--#define slk_restore() /* nothing */
--#define slk_clear() /* nothing */
-+#define slk_init()		/* nothing */
-+#define slk_restore()		/* nothing */
-+#define slk_clear()		/* nothing */
- #endif
- 
- #ifndef HAVE_WSYNCDOWN
--#define wsyncdown(win) /* nothing */
-+#define wsyncdown(win)		/* nothing */
- #endif
- 
- #ifndef USE_WIDEC_SUPPORT
--#if (defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)) && defined(WACS_ULCORNER)
-+#if (defined(_XOPEN_SOURCE_EXTENDED) \
-+  || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500)) \
-+  || (defined(NCURSES_WIDECHAR) && (NCURSES_WIDECHAR - 0 < 1))) \
-+  && defined(WACS_ULCORNER)
- #define USE_WIDEC_SUPPORT 1
- #else
- #define USE_WIDEC_SUPPORT 0
-@@ -653,25 +672,32 @@
-  * The same would be needed for HPUX 10.20
-  */
- #ifndef TPUTS_ARG
-+#define TPUTS_ARG int
-+#endif
-+
- #if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)
-+#undef TPUTS_ARG
- #define TPUTS_ARG char
- extern char *tgoto(char *, int, int);	/* available, but not prototyped */
--#else
--#define TPUTS_ARG int
- #endif
-+
-+#ifndef TPUTS_PROTO
-+#define TPUTS_PROTO(func,value) int func(TPUTS_ARG value)
-+#endif
-+
-+#ifndef TPUTS_RETURN
-+#define TPUTS_RETURN(value) return value
- #endif
- 
- /*
-  * Workarounds for Solaris's X/Open curses
-  */
--#if defined(sun) && defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)
- #if !defined(KEY_MIN) && defined(__KEY_MIN)
- #define KEY_MIN __KEY_MIN
- #endif
- #if !defined(KEY_MAX) && defined(__KEY_MIN)
- #define KEY_MAX __KEY_MAX
- #endif
--#endif
- 
- /*
-  * Workaround to build with Sun's default SVr4 curses.
-@@ -702,23 +728,10 @@
- #define CONST_MENUS		/* nothing */
- #endif
- 
--#ifndef HAVE_USE_WINDOW
--#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) || !NCURSES_EXT_FUNCS
--#define HAVE_USE_WINDOW 0
--#else
--#define HAVE_USE_WINDOW 1
--#endif
--#endif
--
- /*
-  * Simplify setting up demo of threading with these macros.
-  */
- 
--#if !HAVE_USE_WINDOW
--typedef int (*NCURSES_WINDOW_CB) (WINDOW *, void *);
--typedef int (*NCURSES_SCREEN_CB) (SCREEN *, void *);
--#endif
--
- #if HAVE_USE_WINDOW
- #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-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.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: test_addwstr.c,v 1.6 2010/12/12 00:18:00 tom Exp $
-+ * $Id: test_addwstr.c,v 1.8 2012/06/09 20:29:33 tom Exp $
-  *
-  * Demonstrate the waddwstr() and wadd_wch functions.
-  * Thomas Dickey - 2009/9/12
-@@ -233,8 +233,9 @@
-     WINDOW *work = 0;
-     WINDOW *show = 0;
-     int margin = (2 * MY_TABSIZE) - 1;
--    Options option = ((m_opt ? oMove : oDefault)
--		      | ((w_opt || (level > 0)) ? oWindow : oDefault));
-+    Options option = (Options) ((int) (m_opt ? oMove : oDefault)
-+				| (int) ((w_opt || (level > 0))
-+					 ? oWindow : oDefault));
- 
-     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-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 @@
- /****************************************************************************
-- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2009,2011 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 @@
-  * This is an example written by Alexander V. Lukyanov <lav@yars.free.net>,
-  * to demonstrate an inconsistency between ncurses and SVr4 curses.
-  *
-- * $Id: testaddch.c,v 1.7 2009/08/29 19:02:25 tom Exp $
-+ * $Id: testaddch.c,v 1.8 2011/04/23 20:13:12 tom Exp $
-  */
- #include <test.priv.h>
- 
-@@ -63,7 +63,7 @@
-     for (i = 0; i < 8; i++) {
- 	back = (i & 1) ? A_BOLD | 'B' : ' ';
- 	set = (i & 2) ? A_REVERSE : 0;
--	attr = (i & 4) ? COLOR_PAIR(4) : 0;
-+	attr = (chtype) ((i & 4) ? COLOR_PAIR(4) : 0);
- 
- 	bkgdset(back);
- 	(void) attrset(set);
-@@ -74,7 +74,7 @@
-     for (i = 0; i < 8; i++) {
- 	back = (i & 1) ? A_BOLD | 'B' | COLOR_PAIR(1) : ' ';
- 	set = (i & 2) ? A_REVERSE | COLOR_PAIR(2) : 0;
--	attr = (i & 4) ? COLOR_PAIR(4) : 0;
-+	attr = (chtype) ((i & 4) ? COLOR_PAIR(4) : 0);
- 
- 	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-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-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            *
-@@ -50,7 +50,7 @@
-  * scroll operation worked, and the refresh() code only had to do a
-  * partial repaint.
-  *
-- * $Id: view.c,v 1.81 2010/11/14 01:06:02 tom Exp $
-+ * $Id: view.c,v 1.85 2012/06/09 20:29:33 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -110,9 +110,9 @@
- #if CAN_RESIZE
- static RETSIGTYPE adjust(int sig);
- static int interrupted;
-+static bool waiting = FALSE;
- #endif
- 
--static bool waiting = FALSE;
- static int shift = 0;
- static bool try_color = FALSE;
- 
-@@ -121,6 +121,8 @@
- static NCURSES_CH_T **lptr;
- static int num_lines;
- 
-+static void usage(void) GCC_NORETURN;
-+
- static void
- usage(void)
- {
-@@ -180,7 +182,7 @@
- {
-     unsigned len = (unsigned) strlen(src);
-     NCURSES_CH_T *dst = typeMalloc(NCURSES_CH_T, len + 1);
--    unsigned j, k;
-+    size_t j, k;
- #if USE_WIDEC_SUPPORT
-     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);
- 		my_label = "interrupt";
- 	    }
--#endif
- 	    waiting = TRUE;
- 	    c = getch();
- 	    waiting = FALSE;
-+#else
-+	    c = getch();
-+#endif
- 	    if ((c < 127) && isdigit(c)) {
- 		if (!got_number) {
- 		    MvPrintw(0, 0, "Count: ");
Index: patches/ncurses-6.0-bash_fix-1.patch
===================================================================
--- patches/ncurses-6.0-bash_fix-1.patch	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
+++ patches/ncurses-6.0-bash_fix-1.patch	(revision c561eaac237cd41eac635f7031ddd72e4aff3d12)
@@ -0,0 +1,22 @@
+Submitted by: Jim Gifford (patches at jg555 dot com)
+Date: 2007-02-15
+Initial Package Version: 5.6
+Upstream Status: Sent
+Origin: Jim Gifford
+Description: Fixes Ncurses to utilize a buggy version of Bash
+Comment: Renamed for Ncurses 6.0 Upgrade
+
+diff -Naur ncurses-5.6.orig/include/MKhashsize.sh ncurses-5.6/include/MKhashsize.sh
+--- ncurses-5.6.orig/include/MKhashsize.sh	2006-10-21 17:45:39.000000000 -0700
++++ ncurses-5.6/include/MKhashsize.sh	2007-02-15 07:16:46.000000000 -0800
+@@ -35,7 +35,7 @@
+ echo " */"
+ 
+ CAPS="${1-Caps}"
+-TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l`
++TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l)
+ 
+ echo ""
+ echo "#define CAPTABSIZE	${TABSIZE}"
+
+
