Index: BOOK/cross-tools/common/ncurses.xml
===================================================================
--- BOOK/cross-tools/common/ncurses.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/cross-tools/common/ncurses.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -24,9 +24,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="a">Prepare Ncurses for compilation:</para>
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/final-system/alpha-chapter.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
Index: BOOK/final-system/arm-chapter.xml
===================================================================
--- BOOK/final-system/arm-chapter.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/final-system/arm-chapter.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
Index: OK/final-system/common/ncurses-widec.xml
===================================================================
--- BOOK/final-system/common/ncurses-widec.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ 	(revision )
@@ -1,279 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses-widec" role="wrap">
-  <?dbhtml filename="ncurses-widec.html"?>
-
-  <title>Ncurses-&ncurses-version; Widec</title>
-
-  <indexterm zone="ch-system-ncurses-widec">
-    <primary sortas="a-Ncurses">Ncurses Widec</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Ncurses package contains libraries for terminal-independent
-    handling of character screens.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --prefix=/usr --libdir=/lib --with-shared \
-    --without-debug --without-ada --enable-widec --with-build-cc=gcc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a \
-    ${CLFS}/usr/lib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>rm -v ${CLFS}/lib/lib{ncursesw,menuw,panelw,formw,cursesw}.so
-ln -svf ../../lib/libncursesw.so.5 /${CLFS}usr/lib/libcursesw.so
-ln -svf ../../lib/libncursesw.so.5 ${CLFS}/usr/lib/libncursesw.so
-ln -svf ../../lib/libmenuw.so.5 ${CLFS}/usr/lib/libmenuw.so
-ln -svf ../../lib/libpanelw.so.5 ${CLFS}/usr/lib/libpanelw.so
-ln -svf ../../lib/libformw.so.5 ${CLFS}/usr/lib/libformw.so</userinput></screen>
-
-    <para os="k">Give the Ncurses libraries execute permissions:</para>
-
-<screen os="l"><userinput>chmod -v 755 ${CLFS}/lib/lib{panelw,menuw,formw,ncursesw}.so.&ncurses-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-ncurses-widec" role="content">
-    <title>Contents of Ncurses Widec</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-        ncursesw5-config, reset (link to tset), tack, tic, toe, tput, and tset</seg>
-        <seg>libcursesw.so (link to libncurses.so), libformw.[a,so],
-        libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
-        libpanelw.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="captoinfo">
-        <term><command>captoinfo</command></term>
-        <listitem>
-          <para>Converts a termcap description into a terminfo description</para>
-          <indexterm zone="ch-system-ncurses-widec captoinfo">
-            <primary sortas="b-captoinfo">captoinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clear">
-        <term><command>clear</command></term>
-        <listitem>
-          <para>Clears the screen, if possible</para>
-          <indexterm zone="ch-system-ncurses-widec clear">
-            <primary sortas="b-clear">clear</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infocmp">
-        <term><command>infocmp</command></term>
-        <listitem>
-          <para>Compares or prints out terminfo descriptions</para>
-          <indexterm zone="ch-system-ncurses-widec infocmp">
-            <primary sortas="b-infocmp">infocmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infotocap">
-        <term><command>infotocap</command></term>
-        <listitem>
-          <para>Converts a terminfo description into a termcap description</para>
-          <indexterm zone="ch-system-ncurses-widec infotocap">
-            <primary sortas="b-infotocap">infotocap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncursesw5-config">
-        <term><command>ncursesw5-config</command></term>
-        <listitem>
-          <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses-widec ncursesw5-config">
-            <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reset">
-        <term><command>reset</command></term>
-        <listitem>
-          <para>Reinitializes a terminal to its default values</para>
-          <indexterm zone="ch-system-ncurses-widec reset">
-            <primary sortas="b-reset">reset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tack">
-        <term><command>tack</command></term>
-        <listitem>
-          <para>The terminfo action checker; it is mainly used to test the
-          accuracy of an entry in the terminfo database</para>
-          <indexterm zone="ch-system-ncurses-widec tack">
-            <primary sortas="b-tack">tack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tic">
-        <term><command>tic</command></term>
-        <listitem>
-          <para>The terminfo entry-description compiler that translates a
-          terminfo file from source format into the binary format needed for the
-          ncurses library routines. A terminfo file contains information on the
-          capabilities of a certain terminal</para>
-          <indexterm zone="ch-system-ncurses-widec tic">
-            <primary sortas="b-tic">tic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="toe">
-        <term><command>toe</command></term>
-        <listitem>
-          <para>Lists all available terminal types, giving the primary name and
-          description for each</para>
-          <indexterm zone="ch-system-ncurses-widec toe">
-            <primary sortas="b-toe">toe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tput">
-        <term><command>tput</command></term>
-        <listitem>
-          <para>Makes the values of terminal-dependent capabilities available to
-          the shell; it can also be used to reset or initialize a terminal or
-          report its long name</para>
-          <indexterm zone="ch-system-ncurses-widec tput">
-            <primary sortas="b-tput">tput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tset">
-        <term><command>tset</command></term>
-        <listitem>
-          <para>Can be used to initialize terminals</para>
-          <indexterm zone="ch-system-ncurses-widec tset">
-            <primary sortas="b-tset">tset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcursesw">
-        <term><filename class="libraryfile">libcursesw</filename></term>
-        <listitem>
-          <para>A link to <filename>libncursesw</filename></para>
-          <indexterm zone="ch-system-ncurses-widec libcursesw">
-            <primary sortas="c-libcursesw">libcursesw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libncursesw">
-        <term><filename class="libraryfile">libncursesw</filename></term>
-        <listitem>
-          <para>Contains functions to display text in many complex ways on a
-          terminal screen; a good example of the use of these functions is the
-          menu displayed during the kernel's
-          <command>make menuconfig</command></para>
-          <indexterm zone="ch-system-ncurses-widec libncursesw">
-            <primary sortas="c-libncursesw">libncursesw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libformw">
-        <term><filename class="libraryfile">libformw</filename></term>
-        <listitem>
-          <para>Contains functions to implement forms</para>
-          <indexterm zone="ch-system-ncurses-widec libformw">
-            <primary sortas="c-libform">libformw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmenuw">
-        <term><filename class="libraryfile">libmenuw</filename></term>
-        <listitem>
-          <para>Contains functions to implement menus</para>
-          <indexterm zone="ch-system-ncurses-widec libmenuw">
-            <primary sortas="c-libmenuw">libmenuw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpanelw">
-        <term><filename class="libraryfile">libpanelw</filename></term>
-        <listitem>
-          <para>Contains functions to implement panels</para>
-          <indexterm zone="ch-system-ncurses-widec libpanelw">
-            <primary sortas="c-libpanelw">libpanelw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/final-system/common/ncurses.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -26,13 +26,19 @@
     <title>Installation of Ncurses</title>
 
-    <para os="p1">This patch fixes an issue with some Bash versions:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
+    <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="p3">This patch fixes an issue with some Bash versions:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
 
     <para os="a">Prepare Ncurses for compilation:</para>
 
 <screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --prefix=/usr --libdir=/lib --with-shared \
-   --without-debug --without-ada --with-build-cc=gcc</userinput></screen>
+    --prefix=/usr --libdir=/lib --with-shared \
+    --enable-widec --without-debug --without-ada \
+    --with-build-cc=gcc</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -46,19 +52,31 @@
     <para os="g">Move the Ncurses static libraries to the proper location:</para>
 
-<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a \
     ${CLFS}/usr/lib</userinput></screen>
 
     <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
 
-<screen os="j"><userinput>rm -v ${CLFS}/lib/lib{ncurses,menu,panel,form,curses}.so
-ln -sfv ../../lib/libncurses.so.&ncurses-version2; ${CLFS}/usr/lib/libcurses.so
-ln -sfv ../../lib/libncurses.so.&ncurses-version2; ${CLFS}/usr/lib/libncurses.so
-ln -sfv ../../lib/libmenu.so.&ncurses-version2; ${CLFS}/usr/lib/libmenu.so
-ln -sfv ../../lib/libpanel.so.&ncurses-version2; ${CLFS}/usr/lib/libpanel.so
-ln -sfv ../../lib/libform.so.&ncurses-version2; ${CLFS}/usr/lib/libform.so</userinput></screen>
-
-    <para os="k">Give the Ncurses libraries execute permissions:</para>
-
-<screen os="l"><userinput>chmod -v 755 ${CLFS}/lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="j"><userinput>rm -v ${CLFS}/lib/lib{ncursesw,menuw,panelw,formw}.so
+ln -sfv ../../lib/libncursesw.so.&ncurses-version2; ${CLFS}/usr/lib/libncursesw.so
+ln -sfv ../../lib/libmenuw.so.&ncurses-version2; ${CLFS}/usr/lib/libmenuw.so
+ln -sfv ../../lib/libpanelw.so.&ncurses-version2; ${CLFS}/usr/lib/libpanelw.so
+ln -sfv ../../lib/libformw.so.&ncurses-version2; ${CLFS}/usr/lib/libformw.so</userinput></screen>
+
+   <para os="k">Now we will make our Ncurses compatible for older and non-widec compatible programs
+    can build properly:</para>
+
+<screen os="l"><userinput>for lib in curses ncurses form panel menu ; do
+        echo "INPUT(-l${lib}w)" > ${CLFS}/usr/lib/lib${lib}.so
+        ln -sfv lib${lib}w.a ${CLFS}/usr/lib/lib${lib}.a
+done
+ln -sfv libncursesw.so ${CLFS}/usr/lib/libcursesw.so
+ln -sfv libncursesw.a ${CLFS}/usr/lib/libcursesw.a
+ln -sfv libncurses++w.a ${CLFS}/usr/lib/libncurses++.a
+ln -sfv ncursesw5-config ${CLFS}/usr/bin/ncurses5-config</userinput></screen>
+
+    <para os="m">Now we will create a symlink for /usr/share/terminfo in
+    <filename class="directory">/usr/lib</filename> for compatibility:</para>
+
+<screen os="n"><userinput>ln -sfv ../../usr/share/terminfo ${CLFS}/usr/lib/terminfo</userinput></screen>
 
   </sect2>
@@ -72,8 +90,9 @@
 
       <seglistitem>
-        <seg>ncurses5-config</seg>
-        <seg>libcurses.[a,so] (link to libncurses.[a,so]), libform.[a,so],
-        libmenu.[a,so], libncurses++.a, libncurses.[a,so], and
-        libpanel.[a,so]</seg>
+        <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
+        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, and tset</seg>
+        <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
+        libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
+        libpanelw.[a,so]</seg>
       </seglistitem>
     </segmentedlist>
@@ -84,26 +103,132 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="ncurses5-config">
-        <term><command>ncurses5-config</command></term>
+      <varlistentry id="captoinfo">
+        <term><command>captoinfo</command></term>
+        <listitem>
+          <para>Converts a termcap description into a terminfo description</para>
+          <indexterm zone="ch-system-ncurses captoinfo">
+            <primary sortas="b-captoinfo">captoinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="clear">
+        <term><command>clear</command></term>
+        <listitem>
+          <para>Clears the screen, if possible</para>
+          <indexterm zone="ch-system-ncurses clear">
+            <primary sortas="b-clear">clear</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="infocmp">
+        <term><command>infocmp</command></term>
+        <listitem>
+          <para>Compares or prints out terminfo descriptions</para>
+          <indexterm zone="ch-system-ncurses infocmp">
+            <primary sortas="b-infocmp">infocmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="infotocap">
+        <term><command>infotocap</command></term>
+        <listitem>
+          <para>Converts a terminfo description into a termcap description</para>
+          <indexterm zone="ch-system-ncurses infotocap">
+            <primary sortas="b-infotocap">infotocap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ncursesw5-config">
+        <term><command>ncursesw5-config</command></term>
         <listitem>
           <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncurses5-config">
-            <primary sortas="b-ncurses5-config">ncurses5-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcurses">
-        <term><filename class="libraryfile">libcurses</filename></term>
-        <listitem>
-          <para>A link to <filename>libncurses</filename></para>
-          <indexterm zone="ch-system-ncurses libcurses">
-            <primary sortas="c-libcurses">libcurses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libncurses">
-        <term><filename class="libraryfile">libncurses</filename></term>
+          <indexterm zone="ch-system-ncurses ncursesw5-config">
+            <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reset">
+        <term><command>reset</command></term>
+        <listitem>
+          <para>Reinitializes a terminal to its default values</para>
+          <indexterm zone="ch-system-ncurses reset">
+            <primary sortas="b-reset">reset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tabs">
+        <term><command>tabs</command></term>
+        <listitem>
+          <para>Sets and clears tab stops on a terminal</para>
+          <indexterm zone="ch-system-ncurses tabs">
+            <primary sortas="b-tabs">tabs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tic">
+        <term><command>tic</command></term>
+        <listitem>
+          <para>The terminfo entry-description compiler that translates a
+          terminfo file from source format into the binary format needed for the
+          ncurses library routines. A terminfo file contains information on the
+          capabilities of a certain terminal</para>
+          <indexterm zone="ch-system-ncurses tic">
+            <primary sortas="b-tic">tic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="toe">
+        <term><command>toe</command></term>
+        <listitem>
+          <para>Lists all available terminal types, giving the primary name and
+          description for each</para>
+          <indexterm zone="ch-system-ncurses toe">
+            <primary sortas="b-toe">toe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tput">
+        <term><command>tput</command></term>
+        <listitem>
+          <para>Makes the values of terminal-dependent capabilities available to
+          the shell; it can also be used to reset or initialize a terminal or
+          report its long name</para>
+          <indexterm zone="ch-system-ncurses tput">
+            <primary sortas="b-tput">tput</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tset">
+        <term><command>tset</command></term>
+        <listitem>
+          <para>Can be used to initialize terminals</para>
+          <indexterm zone="ch-system-ncurses tset">
+            <primary sortas="b-tset">tset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcursesw">
+        <term><filename class="libraryfile">libcursesw</filename></term>
+        <listitem>
+          <para>A link to <filename>libncursesw</filename></para>
+          <indexterm zone="ch-system-ncurses libcursesw">
+            <primary sortas="c-libcursesw">libcursesw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libncursesw">
+        <term><filename class="libraryfile">libncursesw</filename></term>
         <listitem>
           <para>Contains functions to display text in many complex ways on a
@@ -111,36 +236,36 @@
           menu displayed during the kernel's
           <command>make menuconfig</command></para>
-          <indexterm zone="ch-system-ncurses libncurses">
-            <primary sortas="c-libncurses">libncurses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libform">
-        <term><filename class="libraryfile">libform</filename></term>
+          <indexterm zone="ch-system-ncurses libncursesw">
+            <primary sortas="c-libncursesw">libncursesw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libformw">
+        <term><filename class="libraryfile">libformw</filename></term>
         <listitem>
           <para>Contains functions to implement forms</para>
-          <indexterm zone="ch-system-ncurses libform">
-            <primary sortas="c-libform">libform</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmenu">
-        <term><filename class="libraryfile">libmenu</filename></term>
+          <indexterm zone="ch-system-ncurses libformw">
+            <primary sortas="c-libform">libformw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmenuw">
+        <term><filename class="libraryfile">libmenuw</filename></term>
         <listitem>
           <para>Contains functions to implement menus</para>
-          <indexterm zone="ch-system-ncurses libmenu">
-            <primary sortas="c-libmenu">libmenu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpanel">
-        <term><filename class="libraryfile">libpanel</filename></term>
+          <indexterm zone="ch-system-ncurses libmenuw">
+            <primary sortas="c-libmenuw">libmenuw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpanelw">
+        <term><filename class="libraryfile">libpanelw</filename></term>
         <listitem>
           <para>Contains functions to implement panels</para>
-          <indexterm zone="ch-system-ncurses libpanel">
-            <primary sortas="c-libpanel">libpanel</primary>
+          <indexterm zone="ch-system-ncurses libpanelw">
+            <primary sortas="c-libpanelw">libpanelw</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/hppa-chapter.xml
===================================================================
--- BOOK/final-system/hppa-chapter.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/final-system/hppa-chapter.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/final-system/x86-chapter.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/introduction/common/changelog.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -40,4 +40,8 @@
       <para>Janurary 31, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Ported the NCurses widec builds from trunk and
+          added the branch update patch.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Added command to make Perl use system-installed
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/materials/common/patches.xml	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -137,4 +137,13 @@
 
     <varlistentry>
+      <term>Ncurses Branch Update Patch - <token>&ncurses-branch_update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&ncurses-branch_update-patch;"/></para>
+        <para>MD5 sum: <literal>&ncurses-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Perl Cross Compile Patch - <token>&perl-cross_compile-patch-size;</token>:</term>
       <listitem>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision af447da001eaa79b6375b24bad68f7d34492fb99)
+++ BOOK/patches.ent	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -57,4 +57,8 @@
 <!ENTITY ncurses-bashfix-patch-size "4 KB">
 
+<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-6.patch">
+<!ENTITY ncurses-branch_update-patch-md5 "39811fc1a46d4d6cd7b546e57ea4f3b6">
+<!ENTITY ncurses-branch_update-patch-size "584 KB">
+
 <!ENTITY perl-cross_compile-patch "perl-&perl-version;-cross_compile-5.patch">
 <!ENTITY perl-cross_compile-patch-md5 "7bbb78618e2dd95987ad04c6c54a81c6">
Index: patches/ncurses-5.7-branch_update-6.patch
===================================================================
--- patches/ncurses-5.7-branch_update-6.patch	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
+++ patches/ncurses-5.7-branch_update-6.patch	(revision ef886726e51ccfaddebc32a7b9ea5d4b1b4f8bb7)
@@ -0,0 +1,17512 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 01-27-2009
+Initial Package Version: 5.7
+Origin: Upstream
+Upstream Status: Applied
+Description: This is a branch update for NCurses-5.7, and should be
+             rechecked periodically. This patch covers up to 5.7-20090124.
+
+diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
+--- ncurses-5.7.orig/aclocal.m4	2008-10-25 15:15:32.000000000 -0700
++++ ncurses-5.7/aclocal.m4	2009-01-27 16:45:03.668729990 -0800
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++dnl Copyright (c) 1998-2008,2009 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.470 2008/10/25 22:15:32 tom Exp $
++dnl $Id: aclocal.m4,v 1.482 2009/01/17 21:10:05 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -168,7 +168,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
++dnl CF_ADD_INCDIR version: 10 updated: 2008/12/27 12:30:03
+ dnl -------------
+ dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
+ dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
+@@ -195,7 +195,7 @@
+ 		fi
+ 
+ 		if test "$cf_have_incdir" = no ; then
+-          if test "$cf_add_incdir" = /usr/local/include ; then
++		  if test "$cf_add_incdir" = /usr/local/include ; then
+ 			if test "$GCC" = yes
+ 			then
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+@@ -213,9 +213,9 @@
+ 		  CF_VERBOSE(adding $cf_add_incdir to include-path)
+ 		  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
+ 
+-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+-          test "$cf_top_incdir" = "$cf_add_incdir" && break
+-          cf_add_incdir="$cf_top_incdir"
++		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
++		  test "$cf_top_incdir" = "$cf_add_incdir" && break
++		  cf_add_incdir="$cf_top_incdir"
+ 		else
+ 		  break
+ 		fi
+@@ -353,7 +353,41 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
++dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
++dnl -----------
++dnl Check for suitable "ar" (archiver) options for updating an archive.
++AC_DEFUN([CF_AR_FLAGS],[
++AC_REQUIRE([CF_PROG_AR])
++
++AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
++	cf_cv_ar_flags=unknown
++	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
++	do
++		rm -f conftest.$ac_cv_objext
++		rm -f conftest.a
++
++		cat >conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++int	testdata[[3]] = { 123, 456, 789 };
++EOF
++		if AC_TRY_EVAL(ac_compile) ; then
++			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
++			if test -f conftest.a ; then
++				cf_cv_ar_flags=$cf_ar_flags
++				break
++			fi
++		else
++			CF_VERBOSE(cannot compile test-program)
++			break
++		fi
++	done
++	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
++])
++
++AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
++])
++dnl ---------------------------------------------------------------------------
++dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
+ dnl -----------------
+ dnl Check if awk can handle big strings using printf.  Some older versions of
+ dnl awk choke on large strings passed via "%s".
+@@ -362,19 +396,19 @@
+ dnl $2 = variable to set with result
+ AC_DEFUN([CF_AWK_BIG_PRINTF],
+ [
+-    case x$AWK in #(vi
+-    x)
+-        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
+-            eval $2=yes
+-        else
+-            eval $2=no
+-        fi
+-        ;;
+-    esac
++	case x$AWK in #(vi
++	x)
++		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
++			eval $2=yes
++		else
++			eval $2=no
++		fi
++		;;
++	esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
+@@ -1019,7 +1053,7 @@
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIND_LINKAGE version: 12 updated: 2007/07/29 20:13:53
++dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55
+ dnl ---------------
+ dnl Find a library (specifically the linkage used in the code fragment),
+ dnl searching for it if it is not already in the library path.
+@@ -1052,6 +1086,7 @@
+     cf_cv_find_linkage_$3=yes,[
+     cf_cv_find_linkage_$3=no
+ 
++    CF_VERBOSE(find linkage for $3 library)
+     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
+ 
+     cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -1998,11 +2033,31 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
++dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31
+ dnl --------------
+-dnl Construct a search-list for a nonstandard header-file
++dnl Construct a search-list of directories for a nonstandard header-file
++dnl
++dnl Parameters
++dnl	$1 = the variable to return as result
++dnl	$2 = the package name
+ AC_DEFUN([CF_HEADER_PATH],
+-[CF_SUBDIR_PATH($1,$2,include)
++[
++cf_header_path_list=""
++if test -n "${CFLAGS}${CPPFLAGS}" ; then
++	for cf_header_path in $CPPFLAGS $CFLAGS
++	do
++		case $cf_header_path in #(vi
++		-I*)
++			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
++			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
++			cf_header_path_list="$cf_header_path_list [$]$1"
++			;;
++		esac
++	done
++fi
++
++CF_SUBDIR_PATH($1,$2,include)
++
+ test "$includedir" != NONE && \
+ test "$includedir" != "/usr/include" && \
+ test -d "$includedir" && {
+@@ -2017,6 +2072,7 @@
+ 	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+ }
+ 
++$1="$cf_header_path_list [$]$1"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
+@@ -2143,7 +2199,7 @@
+ ])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
++dnl CF_LDFLAGS_STATIC version: 5 updated: 2008/12/27 12:30:03
+ 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
+@@ -2153,7 +2209,7 @@
+ 
+ if test "$GCC" = yes ; then
+ 	case $cf_cv_system_name in #(
+-	OS/2*|os2*|aix[[45]]*) 	#( vi
++	OS/2*|os2*|aix[[4]]*) 	#( vi
+ 		LDFLAGS_STATIC=
+ 		LDFLAGS_SHARED=
+ 		;;
+@@ -2164,7 +2220,7 @@
+     esac
+ else
+ 	case $cf_cv_system_name in #(
+-	aix[[45]]*) 	#( from ld manpage
++	aix[[456]]*) 	#( from ld manpage
+ 		LDFLAGS_STATIC=-bstatic
+ 		LDFLAGS_SHARED=-bdynamic
+ 		;;
+@@ -2179,7 +2235,7 @@
+ 		;;
+ 	osf[[45]]*)	#( from ld manpage osf4.0d, osf5.1
+ 		# alternative "-oldstyle_liblookup" (not in cc manpage)
+-		LDFLAGS_STATIC=-noso 
++		LDFLAGS_STATIC=-noso
+ 		LDFLAGS_SHARED=-so_archive
+ 		;;
+ 	solaris2*)
+@@ -2193,11 +2249,33 @@
+ AC_SUBST(LDFLAGS_SHARED)
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
++dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
+ dnl ---------------
+-dnl Construct a search-list for a nonstandard library-file
++dnl Construct a search-list of directories for a nonstandard library-file
++dnl
++dnl Parameters
++dnl	$1 = the variable to return as result
++dnl	$2 = the package name
+ AC_DEFUN([CF_LIBRARY_PATH],
+-[CF_SUBDIR_PATH($1,$2,lib)])dnl
++[
++cf_library_path_list=""
++if test -n "${LDFLAGS}${LIBS}" ; then
++	for cf_library_path in $LDFLAGS $LIBS
++	do
++		case $cf_library_path in #(vi
++		-L*)
++			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
++			CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
++			cf_library_path_list="$cf_library_path_list [$]$1"
++			;;
++		esac
++	done
++fi
++
++CF_SUBDIR_PATH($1,$2,lib)
++
++$1="$cf_library_path_list [$]$1"
++])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
+ dnl -------------
+@@ -2216,7 +2294,7 @@
+ 	AC_SUBST(LIB_PREFIX)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_RULES version: 53 updated: 2008/09/20 19:51:59
++dnl CF_LIB_RULES version: 55 updated: 2008/12/13 16:17:38
+ 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
+@@ -2504,18 +2582,28 @@
+ install.libs uninstall.libs \\
+ install.data uninstall.data ::
+ $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
++CF_EOF
++
++if test "x$cf_with_manpages" = xyes; then
++cat >> Makefile <<CF_EOF
+ 
+ install.man \\
+ uninstall.man ::
+ 	cd man && \${MAKE} \${CF_MFLAGS} \[$]@
++CF_EOF
++fi
++
++cat >> Makefile <<CF_EOF
+ 
+ distclean ::
+ 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
+ 	rm -f headers.sh headers.sed mk_shared_lib.sh
++	rm -f edit_man.* man_alias.*
+ 	rm -rf \${DIRS_TO_MAKE}
+ CF_EOF
+ 
+ # Special case: tack's manpage lives in its own directory.
++if test "x$cf_with_manpages" = xyes; then
+ if test -d tack ; then
+ if test -f $srcdir/$tack.h; then
+ cat >> Makefile <<CF_EOF
+@@ -2526,6 +2614,7 @@
+ CF_EOF
+ fi
+ fi
++fi
+ 
+ dnl If we're installing into a subdirectory of /usr/include, etc., we should
+ dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
+@@ -2679,7 +2768,7 @@
+ ])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
++dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
+ dnl -------------
+ dnl Compute the library file-suffix from the given model name
+ dnl $1 = model name
+@@ -2689,40 +2778,44 @@
+ AC_DEFUN([CF_LIB_SUFFIX],
+ [
+ 	AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+-	case $1 in
+-	libtool)
++	case $1 in #(vi
++	libtool) #(vi
+ 		$2='.la'
+ 		$3=[$]$2
+ 		;;
+-	normal)
++	normal) #(vi
+ 		$2='.a'
+ 		$3=[$]$2
+ 		;;
+-	debug)
++	debug) #(vi
+ 		$2='_g.a'
+ 		$3=[$]$2
+ 		;;
+-	profile)
++	profile) #(vi
+ 		$2='_p.a'
+ 		$3=[$]$2
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[[56]]*) #(vi
++			$2='.a'
++			$3=[$]$2
++			;;
++		cygwin*) #(vi
+ 			$2='.dll'
+ 			$3='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			$2='.dylib'
+ 			$3=[$]$2
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				$2='.so'
+ 				$3=[$]$2
+ 				;;
+-			*)
++			*) #(vi
+ 				$2='.sl'
+ 				$3=[$]$2
+ 				;;
+@@ -2755,7 +2848,7 @@
+ 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_DATAONLY version: 8 updated: 2006/12/16 12:33:30
++dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38
+ dnl ----------------
+ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
+ dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
+@@ -2772,7 +2865,7 @@
+ EOF
+ 	if AC_TRY_EVAL(ac_compile) ; then
+ 		mv conftest.o data.o && \
+-		( $AR $AR_OPTS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
++		( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <<EOF
+@@ -2791,7 +2884,7 @@
+ EOF
+ 	if AC_TRY_EVAL(ac_compile); then
+ 		mv conftest.o func.o && \
+-		( $AR $AR_OPTS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
++		( $AR $ARFLAGS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext func.o
+ 	( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
+@@ -3737,6 +3830,38 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28
++dnl -------------
++dnl Check for the package-config program, unless disabled by command-line.
++AC_DEFUN([CF_PKG_CONFIG],
++[
++AC_MSG_CHECKING(if you want to use pkg-config)
++AC_ARG_WITH(pkg-config,
++	[  --with-pkg-config{=path} enable/disable use of pkg-config],
++	[cf_pkg_config=$withval],
++	[cf_pkg_config=yes])
++AC_MSG_RESULT($cf_pkg_config)
++
++case $cf_pkg_config in
++no)
++	PKG_CONFIG=none
++	;;
++yes)
++	AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
++	;;
++*)
++	PKG_CONFIG=$withval
++	;;
++esac
++
++test -z "$PKG_CONFIG" && PKG_CONFIG=none
++if test "$PKG_CONFIG" != none ; then
++	CF_PATH_SYNTAX(PKG_CONFIG)
++fi
++
++AC_SUBST(PKG_CONFIG)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
+ dnl -----------------
+ dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
+@@ -3872,6 +3997,13 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
++dnl ----------
++dnl Check for archiver "ar".
++AC_DEFUN([CF_PROG_AR],[
++AC_CHECK_TOOL(AR, ar, ar)
++])
++dnl ---------------------------------------------------------------------------
+ dnl CF_PROG_AWK version: 1 updated: 2006/09/16 11:40:59
+ dnl -----------
+ dnl Check for awk, ensure that the check found something.
+@@ -4003,7 +4135,7 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_LDCONFIG version: 1 updated: 2003/09/20 17:07:55
++dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40
+ dnl ----------------
+ dnl Check for ldconfig, needed to fixup shared libraries that would be built
+ dnl and then used in the install.
+@@ -4012,7 +4144,7 @@
+   LDCONFIG=:
+ else
+ case "$cf_cv_system_name" in #(vi
+-freebsd*) #(vi
++dragonfly*|freebsd*) #(vi
+   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
+   ;;
+ *) LDPATH=$PATH:/sbin:/usr/sbin
+@@ -4147,7 +4279,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
++dnl CF_SHARED_OPTS version: 57 updated: 2009/01/17 16:10:05
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -4176,6 +4308,7 @@
+ 	AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+ 	LOCAL_LDFLAGS=
+ 	LOCAL_LDFLAGS2=
++	LD_RPATH_OPT=
+ 	LD_SHARED_OPTS=
+ 	INSTALL_LIB="-m 644"
+ 
+@@ -4219,6 +4352,12 @@
+ 	cf_cv_shlib_version_infix=no
+ 
+ 	case $cf_cv_system_name in
++	aix[[56]]*)
++		if test "$GCC" = yes; then
++			CC_SHARED_OPTS=
++			MK_SHARED_LIB="$(CC) -shared"
++		fi
++		;;
+ 	beos*)
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
+ 		;;
+@@ -4239,7 +4378,7 @@
+ 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 
++		chmod +x mk_shared_lib.sh
+ 		;;
+ 	darwin*)
+ 		EXTRA_CFLAGS="-no-cpp-precomp"
+@@ -4272,10 +4411,10 @@
+ 	irix*)
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+ 			if test "$GCC" = yes; then
+-				cf_ld_rpath_opt="-Wl,-rpath,"
++				LD_RPATH_OPT="-Wl,-rpath,"
+ 				EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 			else
+-				cf_ld_rpath_opt="-rpath "
++				LD_RPATH_OPT="-rpath "
+ 				EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 			fi
+ 		fi
+@@ -4294,7 +4433,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+@@ -4306,12 +4445,12 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ 		CF_SHARED_SONAME
+-		MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
++		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+ 		;;
+ 	nto-qnx*|openbsd*|freebsd[[12]].*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+@@ -4323,15 +4462,15 @@
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
+-			cf_ld_rpath_opt="-rpath "
++			LD_RPATH_OPT="-rpath "
+ 			EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+-		MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $[@]` -o $[@]'
++		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
+ 		;;
+ 	netbsd*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+-		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
++		test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+@@ -4346,7 +4485,7 @@
+ 			CF_SHARED_SONAME
+ 			MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
+ 		else
+-			MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
++			MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'
+ 		fi
+ 		;;
+ 	osf*|mls+*)
+@@ -4365,7 +4504,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-rpath"
++			LD_RPATH_OPT="-rpath"
+ 			# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 		cf_cv_rm_so_locs=yes
+@@ -4400,12 +4539,19 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-R"
++			LD_RPATH_OPT="-R"
+ 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+ 		if test "$GCC" != yes; then
+-			CC_SHARED_OPTS='-xcode=pic32'
++			cf_save_CFLAGS="$CFLAGS"
++			for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
++			do
++				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
++				AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
++			done
++			CFLAGS="$cf_save_CFLAGS"
++			CC_SHARED_OPTS=$cf_shared_opts
+ 			MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ 		else
+ 			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+@@ -4438,18 +4584,19 @@
+ 		;;
+ 	esac
+ 
+-	if test -n "$cf_ld_rpath_opt" ; then
++	if test -n "$LD_RPATH_OPT" ; then
+ 		AC_MSG_CHECKING(if we need a space after rpath option)
+ 		cf_save_LIBS="$LIBS"
+-		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
++		LIBS="$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 && cf_ld_rpath_opt="$cf_ld_rpath_opt "
+-		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
++		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
++		MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
+ 	fi
+ 
+ 	AC_SUBST(CC_SHARED_OPTS)
++	AC_SUBST(LD_RPATH_OPT)
+ 	AC_SUBST(LD_SHARED_OPTS)
+ 	AC_SUBST(MK_SHARED_LIB)
+ 	AC_SUBST(LINK_PROGS)
+@@ -4642,7 +4789,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SRC_MODULES version: 18 updated: 2005/05/28 12:58:54
++dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03
+ 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
+@@ -4717,7 +4864,11 @@
+ AC_SUBST(TEST_ARG2)
+ AC_SUBST(TEST_DEP2)
+ 
+-SRC_SUBDIRS="man include"
++SRC_SUBDIRS=
++if test "x$cf_with_manpages" != xno ; then
++	SRC_SUBDIRS="$SRC_SUBDIRS man"
++fi
++SRC_SUBDIRS="$SRC_SUBDIRS include"
+ for cf_dir in $cf_cv_src_modules
+ do
+ 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
+@@ -4728,8 +4879,8 @@
+ 
+ ADA_SUBDIRS=
+ if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
+-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
+-   ADA_SUBDIRS="gen src samples"
++	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
++	ADA_SUBDIRS="gen src samples"
+ fi
+ 
+ SUB_MAKEFILES=
+@@ -4739,11 +4890,11 @@
+ done
+ 
+ if test -n "$ADA_SUBDIRS"; then
+-   for cf_dir in $ADA_SUBDIRS
+-   do
+-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
+-   done
+-   AC_SUBST(ADA_SUBDIRS)
++	for cf_dir in $ADA_SUBDIRS
++	do
++		SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
++	done
++	AC_SUBST(ADA_SUBDIRS)
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+@@ -5241,7 +5392,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
++dnl CF_WITH_LIBTOOL version: 20 updated: 2008/12/27 12:31:39
+ dnl ---------------
+ dnl Provide a configure option to incorporate libtool.  Define several useful
+ dnl symbols for the makefile rules.
+@@ -5261,18 +5412,18 @@
+ dnl		echo cannot find libtool.m4 file
+ dnl		exit 1
+ dnl	fi
+-dnl	
++dnl
+ dnl	LOCAL=aclocal.m4
+ dnl	ORIG=aclocal.m4.orig
+-dnl	
++dnl
+ dnl	trap "mv $ORIG $LOCAL" 0 1 2 5 15
+ dnl	rm -f $ORIG
+ dnl	mv $LOCAL $ORIG
+-dnl	
++dnl
+ dnl	# sed the LIBTOOL= assignment to omit the current directory?
+ dnl	sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
+ dnl	cat $ORIG >>$LOCAL
+-dnl	
++dnl
+ dnl	autoconf-257 $*
+ dnl
+ AC_DEFUN([CF_WITH_LIBTOOL],
+@@ -5306,15 +5457,15 @@
+ 	AC_PROG_LIBTOOL
+ 	# missing_content_AC_PROG_LIBTOOL}}
+ ],[
+- 	if test "$with_libtool" != "yes" ; then
++	if test "$with_libtool" != "yes" ; then
+ 		CF_PATH_SYNTAX(with_libtool)
+ 		LIBTOOL=$with_libtool
+ 	else
+- 		AC_PATH_PROG(LIBTOOL,libtool)
+- 	fi
+- 	if test -z "$LIBTOOL" ; then
+- 		AC_MSG_ERROR(Cannot find libtool)
+- 	fi
++		AC_PATH_PROG(LIBTOOL,libtool)
++	fi
++	if test -z "$LIBTOOL" ; then
++		AC_MSG_ERROR(Cannot find libtool)
++	fi
+ ])dnl
+ 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+@@ -5535,7 +5686,7 @@
+ 	[USE_VALGRIND])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
++dnl CF_XOPEN_SOURCE version: 28 updated: 2008/12/27 12:30:03
+ 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,
+@@ -5552,7 +5703,7 @@
+ cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
+ 
+ case $host_os in #(vi
+-aix[[45]]*) #(vi
++aix[[456]]*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+ 	;;
+ freebsd*|dragonfly*) #(vi
+@@ -5569,7 +5720,7 @@
+ irix[[56]].*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+ 	;;
+-linux*|gnu*|k*bsd*-gnu) #(vi
++linux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 	CF_GNU_SOURCE
+ 	;;
+ mirbsd*) #(vi
+diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
+--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in	2007-04-07 14:06:50.000000000 -0700
++++ ncurses-5.7/Ada95/gen/adacurses-config.in	2009-01-27 16:45:02.332643665 -0800
+@@ -1,18 +1,47 @@
+ #! /bin/sh
+-# $Id: adacurses-config.in,v 1.2 2007/04/07 21:06:50 tom Exp $
+-#
+-# This script will return the option to add to `gnatmake' for using
+-# AdaCurses.
++# $Id: adacurses-config.in,v 1.5 2009/01/11 00:08:19 tom Exp $
++##############################################################################
++# Copyright (c) 2007,2009 Free 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.                                                             #
++##############################################################################
+ #
++# This script returns the options to add to `gnatmake' for using AdaCurses.
++
++DESTDIR=@DESTDIR@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ 
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
++ADA_INCLUDE=@ADA_INCLUDE@
++ADA_OBJECTS=@ADA_OBJECTS@
+ 
+-VERSION="@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@"
++VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
+ 
+-CFLAGS="-I$libdir/adacurses -L$libdir/adacurses"
+-LIBS="-L$prefix/lib -lAdaCurses"
++CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS"
++LIBS="-L$ADA_OBJECTS -lAdaCurses"
+ 
+ case "x$1" in
+     x--version)
+@@ -26,10 +55,10 @@
+         ;;
+     x)
+     	# if no parameter is given, give what gnatmake needs
+-        echo $CFLAGS -largs $LIBS
++        echo "$CFLAGS -i -largs $LIBS"
+         ;;
+     *)
+-        echo 'Usage: adacurses-config [--version | --cflags | --libs]' >&2
++        echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2
+         exit 1
+         ;;
+ esac
+diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
+--- ncurses-5.7.orig/Ada95/gen/Makefile.in	2008-10-04 15:58:31.000000000 -0700
++++ ncurses-5.7/Ada95/gen/Makefile.in	2009-01-27 16:45:02.332643665 -0800
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 Free 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.61 2008/10/04 22:58:31 tom Exp $
++#  $Id: Makefile.in,v 1.63 2009/01/11 01:11:35 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -81,7 +81,7 @@
+ M4		= m4
+ M4FLAGS		= -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@
+ 
+-ADACURSES_CONFIG = adacurses-config
++ADACURSES_CONFIG = adacurses@DFT_ARG_SUFFIX@-config
+ 
+ WRAPPER		= sh $(top_srcdir)/misc/shlib
+ GENERATE	= ./gen$x '@DFT_ARG_SUFFIX@'
+@@ -166,6 +166,7 @@
+ 
+ sources:
+ 
++$(DESTDIR)$(bindir) \
+ $(ADA_INCLUDE) \
+ $(ADA_OBJECTS) :
+ 	sh $(top_srcdir)/mkdirs.sh $@
+@@ -187,8 +188,8 @@
+ 	@-chmod u+x $(ADA_SRCDIR)/*.ali
+ 
+ install \
+-install.libs :: $(DESTDIR)$(bindir) adacurses-config
+-	$(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
++install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
++	$(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+ 
+ uninstall \
+ uninstall.libs ::
+@@ -398,7 +399,7 @@
+ 	-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
+ 
+ distclean :: clean
+-	-rm -f adacurses-config
++	-rm -f $(ADACURSES_CONFIG)
+ 	-rm -f Makefile
+ 
+ realclean :: distclean
+diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
+--- ncurses-5.7.orig/Ada95/samples/Makefile.in	2006-12-17 08:45:02.000000000 -0800
++++ ncurses-5.7/Ada95/samples/Makefile.in	2009-01-27 16:45:02.332643665 -0800
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 Free 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.34 2006/12/17 16:45:02 tom Exp $
++#  $Id: Makefile.in,v 1.36 2009/01/11 01:11:54 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -88,8 +88,8 @@
+ 
+ CARGS        =-cargs $(ADAFLAGS)
+ LARGS        =-largs @TEST_ARG2@ $(LD_FLAGS) -lAdaCurses
+- 
+-PROGS        = tour rain ncurses 
++
++PROGS        = tour rain ncurses
+ 
+ TOUR_OBJS    =	tour.o sample.o sample-curses_demo.o sample-explanation.o 	\
+ 		sample-form_demo.o sample-function_key_setting.o 		\
+@@ -145,7 +145,7 @@
+ 
+ clean :: mostlyclean
+ 	rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \
+-	explain.msg trace screendump 
++	explain.msg trace screendump b~*.ad[bs]
+ 
+ distclean :: clean
+ 	rm -f Makefile
+diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
+--- ncurses-5.7.orig/Ada95/src/Makefile.in	2007-09-15 11:22:24.000000000 -0700
++++ ncurses-5.7/Ada95/src/Makefile.in	2009-01-27 16:45:02.332643665 -0800
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free 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.31 2007/09/15 18:22:24 tom Exp $
++#  $Id: Makefile.in,v 1.34 2009/01/11 01:11:44 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -36,17 +36,22 @@
+ THIS		= Makefile
+ 
+ MODEL		= ../../@DFT_OBJ_SUBDIR@
++
+ DESTDIR		= @DESTDIR@
++
++top_srcdir	= @top_srcdir@
+ srcdir		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+-ADA_INCLUDE	= @ADA_INCLUDE@
++
++ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
++ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL@ @INSTALL_LIB@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LN_S		= @LN_S@
+ 
+@@ -75,11 +80,12 @@
+ ADAFLAGS        = @ADAFLAGS@ -I. -I$(srcdir)
+ 
+ ADAMAKE         = @cf_ada_make@
+-ADAMAKEFLAGS    = 
++ADAMAKEFLAGS    =
+ 
+ CARGS           = -cargs $(ADAFLAGS)
+ LARGS           =
+ 
++LIBRARY_FILE	= libAdaCurses.a
+ ALIB            = @cf_ada_package@
+ ABASE           = $(ALIB)-curses
+ 
+@@ -164,21 +170,25 @@
+ 	$(ABASE)-text_io-complex_io.o
+ 
+ 
+-all ::  libAdaCurses.a
++all ::  $(LIBRARY_FILE)
+ 	@echo done
+ 
+-libAdaCurses.a :: dotouch $(LIBOBJS) @cf_generic_objects@
+-	$(AR) $(AR_OPTS) $@ $(LIBOBJS) @cf_generic_objects@
+-
+-dotouch :
+-	@sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done'
++$(LIBRARY_FILE) :: $(LIBOBJS) @cf_generic_objects@
++	$(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
+ 
+ sources :
+ 	@echo made $@
+ 
+ libs \
+ install \
+-install.libs \
++install.libs :: $(LIBRARY_FILE)
++	@echo made $(LIBRARY_FILE)
++
++install \
++install.libs :: $(LIBRARY_FILE)
++	@$(top_srcdir)/tar-copy.sh $(LIBRARY_FILE) . $(ADA_OBJECTS)
++	@echo made $@
++
+ uninstall \
+ uninstall.libs ::
+ 	@echo made $@
+diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
+--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb	2008-07-26 11:51:11.000000000 -0700
++++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb	2009-01-27 16:44:46.507629836 -0800
+@@ -35,8 +35,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  $Revision: 1.22 $
+---  $Date: 2008/07/26 18:51:11 $
++--  $Revision: 1.23 $
++--  $Date: 2008/11/16 00:19:59 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
+@@ -50,7 +50,7 @@
+    function Has_Mouse return Boolean
+    is
+       function Mouse_Avail return C_Int;
+-      pragma Import (C, Mouse_Avail, "_nc_has_mouse");
++      pragma Import (C, Mouse_Avail, "has_mouse");
+    begin
+       if Has_Key (Key_Mouse) or else Mouse_Avail /= 0 then
+          return True;
+diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
+--- ncurses-5.7.orig/c++/cursesw.cc	2007-12-15 15:01:57.000000000 -0800
++++ ncurses-5.7/c++/cursesw.cc	2009-01-27 16:44:46.511630953 -0800
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2007,2008 Free 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.49 2007/12/15 23:01:57 tom Exp $")
++MODULE_ID("$Id: cursesw.cc,v 1.50 2008/11/23 00:17:31 juergen Exp $")
+ 
+ #define COLORS_NEED_INITIALIZATION  -1
+ #define COLORS_NOT_INITIALIZED       0
+@@ -287,7 +287,6 @@
+ {
+     initialize();
+     w = win;
+-    assert((w->_maxx +1 ) == ncols);
+ }
+ 
+ int _nc_xx_ripoff_init(WINDOW *w, int ncols)
+@@ -464,7 +463,7 @@
+ #if HAVE_HAS_KEY
+ bool NCursesWindow::has_mouse() const
+ {
+-    return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
++    return ((::has_key(KEY_MOUSE) || ::has_mouse())
+ 	     ? TRUE : FALSE);
+ }
+ #endif
+diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
+--- ncurses-5.7.orig/c++/Makefile.in	2007-04-28 08:29:12.000000000 -0700
++++ ncurses-5.7/c++/Makefile.in	2009-01-27 16:44:58.008364855 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
++# $Id: Makefile.in,v 1.85 2009/01/03 19:10:40 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free 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,10 +61,10 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ 
+ CXX_AR		= @CXX_AR@
+-CXX_AR_OPTS	= @CXX_AR_OPTS@
++CXX_ARFLAGS	= @CXX_ARFLAGS@
+ RANLIB		= @LIB_PREP@
+ 
+ CXX		= @CXX@
+@@ -153,7 +153,7 @@
+ 	$(MODEL)/cursesmain$o
+ 
+ ../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
+-	$(CXX_AR) $(CXX_AR_OPTS) $@ $?
++	$(CXX_AR) $(CXX_ARFLAGS) $@ $?
+ 	$(RANLIB) $@
+ 
+ ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
+diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
+--- ncurses-5.7.orig/config.guess	2008-08-30 13:25:07.000000000 -0700
++++ ncurses-5.7/config.guess	2009-01-27 16:44:58.008364855 -0800
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2008-04-14'
++timestamp='2008-12-19'
+ 
+ # 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
+@@ -331,7 +331,20 @@
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -796,7 +809,7 @@
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd)
++	    EM64T | authenticamd | genuineintel)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+@@ -935,6 +948,9 @@
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
++    padre:Linux:*:*)
++	echo sparc-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
+@@ -1138,6 +1154,16 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
+--- ncurses-5.7.orig/config.sub	2008-08-30 13:25:02.000000000 -0700
++++ ncurses-5.7/config.sub	2009-01-27 16:44:58.008364855 -0800
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2008-06-16'
++timestamp='2008-12-11'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -249,6 +249,7 @@
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+ 	| maxq | mb | microblaze | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+@@ -279,7 +280,7 @@
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+ 	| score \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| 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 \
+@@ -288,7 +289,7 @@
+ 	| v850 | v850e \
+ 	| we32k \
+ 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+@@ -331,6 +332,7 @@
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+@@ -362,7 +364,7 @@
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| 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-* \
+@@ -375,7 +377,7 @@
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ 	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
+ 		;;
+ 	# Recognize the basic CPU types without company name, with glob match.
+ 	xtensa*)
+@@ -1140,6 +1142,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1178,7 +1184,7 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
+--- ncurses-5.7.orig/configure	2008-10-25 17:04:38.000000000 -0700
++++ ncurses-5.7/configure	2009-01-27 16:45:03.672730548 -0800
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.454 .
++# From configure.in Revision: 1.464 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20080325.
++# Generated by Autoconf 2.52.20081225.
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+@@ -697,8 +697,11 @@
+   --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-curses-h      install curses.h as ncurses.h only
++  --with-pkg-config{=path} enable/disable use of pkg-config
++  --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)
+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
+@@ -870,7 +873,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.20080325.  Invocation command line was
++generated by GNU Autoconf 2.52.20081225.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -994,7 +997,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:997: loading site script $ac_site_file" >&5
++    { echo "$as_me:1000: 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"
+@@ -1005,7 +1008,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:1008: loading cache $cache_file" >&5
++    { echo "$as_me:1011: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1013,7 +1016,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1016: creating cache $cache_file" >&5
++  { echo "$as_me:1019: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1029,21 +1032,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1035: 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:1036: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1039: 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:1042: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1045: 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:1044:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1047:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
++        { echo "$as_me:1049:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1062,9 +1065,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1068: 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:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1070: 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
+@@ -1085,10 +1088,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1091: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1091: \$? = $ac_status" >&5
++  echo "$as_me:1094: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1101,7 +1104,7 @@
+ 
+ top_builddir=`pwd`
+ 
+-echo "$as_me:1104: checking for egrep" >&5
++echo "$as_me:1107: 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
+@@ -1111,11 +1114,11 @@
+     else ac_cv_prog_egrep='egrep'
+     fi
+ fi
+-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1117: 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:1118: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:1121: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -1125,7 +1128,7 @@
+ cf_cv_abi_version=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1131: 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
+@@ -1133,7 +1136,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:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1139: 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;
+@@ -1146,13 +1149,13 @@
+   [0-9]*) #(vi
+  	;;
+   *)
+-	{ { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1152: 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:1155: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1158: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1162,13 +1165,13 @@
+   [0-9]*) #(vi
+  	;;
+   *)
+-	{ { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1168: 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:1171: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1174: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1178,7 +1181,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:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++  { echo "$as_me:1184: 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;
+@@ -1188,13 +1191,13 @@
+   [0-9]*) #(vi
+  	;;
+   *)
+-	{ { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1194: 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:1197: error: ABI version value is empty" >&5
++  { { echo "$as_me:1200: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1216,7 +1219,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1222: 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
+@@ -1226,11 +1229,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1232: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1233: checking build system type" >&5
++echo "$as_me:1236: 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
+@@ -1239,23 +1242,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1245: 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:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1249: 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:1251: result: $ac_cv_build" >&5
++echo "$as_me:1254: 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:1258: checking host system type" >&5
++echo "$as_me:1261: 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
+@@ -1264,12 +1267,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:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1270: 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:1272: result: $ac_cv_host" >&5
++echo "$as_me:1275: 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/'`
+@@ -1277,7 +1280,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:1280: checking target system type" >&5
++	echo "$as_me:1283: 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
+@@ -1286,12 +1289,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:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1292: 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:1294: result: $ac_cv_target" >&5
++echo "$as_me:1297: 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/'`
+@@ -1322,13 +1325,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1328: 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:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1332: 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:1331: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1334: 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
+@@ -1336,7 +1339,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:1339: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1342: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+  cf_cv_system_name=$withval
+ fi;
+@@ -1346,7 +1349,7 @@
+ 
+ ###	Default install-location
+ 
+-echo "$as_me:1349: checking for prefix" >&5
++echo "$as_me:1352: 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
+@@ -1358,11 +1361,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1361: result: $prefix" >&5
++echo "$as_me:1364: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1365: checking for default include-directory" >&5
++echo "$as_me:1368: 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 \
+@@ -1385,7 +1388,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1388: result: $includedir" >&5
++echo "$as_me:1391: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1399,7 +1402,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:1402: checking for $ac_word" >&5
++echo "$as_me:1405: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1414,7 +1417,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:1417: found $ac_dir/$ac_word" >&5
++echo "$as_me:1420: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1422,10 +1425,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1425: result: $CC" >&5
++  echo "$as_me:1428: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1428: result: no" >&5
++  echo "$as_me:1431: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1434,7 +1437,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:1437: checking for $ac_word" >&5
++echo "$as_me:1440: 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
+@@ -1449,7 +1452,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:1452: found $ac_dir/$ac_word" >&5
++echo "$as_me:1455: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1457,10 +1460,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1460: result: $ac_ct_CC" >&5
++  echo "$as_me:1463: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1463: result: no" >&5
++  echo "$as_me:1466: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1473,7 +1476,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:1476: checking for $ac_word" >&5
++echo "$as_me:1479: 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
+@@ -1488,7 +1491,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:1491: found $ac_dir/$ac_word" >&5
++echo "$as_me:1494: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1496,10 +1499,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1499: result: $CC" >&5
++  echo "$as_me:1502: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1502: result: no" >&5
++  echo "$as_me:1505: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1508,7 +1511,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:1511: checking for $ac_word" >&5
++echo "$as_me:1514: 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
+@@ -1523,7 +1526,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:1526: found $ac_dir/$ac_word" >&5
++echo "$as_me:1529: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1531,10 +1534,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1534: result: $ac_ct_CC" >&5
++  echo "$as_me:1537: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1537: result: no" >&5
++  echo "$as_me:1540: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1547,7 +1550,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:1550: checking for $ac_word" >&5
++echo "$as_me:1553: 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
+@@ -1567,7 +1570,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
++echo "$as_me:1573: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1589,10 +1592,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1592: result: $CC" >&5
++  echo "$as_me:1595: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1595: result: no" >&5
++  echo "$as_me:1598: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1603,7 +1606,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:1606: checking for $ac_word" >&5
++echo "$as_me:1609: 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
+@@ -1618,7 +1621,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:1621: found $ac_dir/$ac_word" >&5
++echo "$as_me:1624: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1626,10 +1629,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1629: result: $CC" >&5
++  echo "$as_me:1632: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1632: result: no" >&5
++  echo "$as_me:1635: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1642,7 +1645,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:1645: checking for $ac_word" >&5
++echo "$as_me:1648: 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
+@@ -1657,7 +1660,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:1660: found $ac_dir/$ac_word" >&5
++echo "$as_me:1663: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1665,10 +1668,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1668: result: $ac_ct_CC" >&5
++  echo "$as_me:1671: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1671: result: no" >&5
++  echo "$as_me:1674: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1680,32 +1683,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1686: 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:1688:" \
++echo "$as_me:1691:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1694: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1694: \$? = $ac_status" >&5
++  echo "$as_me:1697: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1699: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1699: \$? = $ac_status" >&5
++  echo "$as_me:1702: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1704: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1704: \$? = $ac_status" >&5
++  echo "$as_me:1707: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1708 "configure"
++#line 1711 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1721,13 +1724,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:1724: checking for C compiler default output" >&5
++echo "$as_me:1727: 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:1727: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1730: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1730: \$? = $ac_status" >&5
++  echo "$as_me:1733: \$? = $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
+@@ -1736,7 +1739,7 @@
+                 ls a.out conftest 2>/dev/null;
+                 ls a.* conftest.* 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     a.out ) # We found the default executable, but exeext='' is most
+             # certainly right.
+             break;;
+@@ -1750,34 +1753,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1756: 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:1759: result: $ac_file" >&5
++echo "$as_me:1762: 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:1764: checking whether the C compiler works" >&5
++echo "$as_me:1767: 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:1770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1773: \$? = $ac_status" >&5
++  echo "$as_me:1776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1780: error: cannot run C compiled programs.
++	{ { echo "$as_me:1783: 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;}
+@@ -1785,24 +1788,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1788: result: yes" >&5
++echo "$as_me:1791: 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:1795: checking whether we are cross compiling" >&5
++echo "$as_me:1798: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1797: result: $cross_compiling" >&5
++echo "$as_me:1800: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1800: checking for executable suffix" >&5
++echo "$as_me:1803: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1805: \$? = $ac_status" >&5
++  echo "$as_me:1808: \$? = $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
+@@ -1810,7 +1813,7 @@
+ # `rm'.
+ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+           export ac_cv_exeext
+           break;;
+@@ -1818,25 +1821,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1824: 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:1827: result: $ac_cv_exeext" >&5
++echo "$as_me:1830: 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:1833: checking for object suffix" >&5
++echo "$as_me:1836: 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 1839 "configure"
++#line 1842 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1848,14 +1851,14 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1854: \$? = $ac_status" >&5
++  echo "$as_me:1857: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -1863,24 +1866,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1869: 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:1873: result: $ac_cv_objext" >&5
++echo "$as_me:1876: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1880: 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 1883 "configure"
++#line 1886 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1895,16 +1898,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1901: \$? = $ac_status" >&5
++  echo "$as_me:1904: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1907: \$? = $ac_status" >&5
++  echo "$as_me:1910: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1916,19 +1919,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1922: 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:1925: checking whether $CC accepts -g" >&5
++echo "$as_me:1928: 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 1931 "configure"
++#line 1934 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1940,16 +1943,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1946: \$? = $ac_status" >&5
++  echo "$as_me:1949: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1952: \$? = $ac_status" >&5
++  echo "$as_me:1955: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1959,7 +1962,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1965: 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
+@@ -1986,16 +1989,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1992: \$? = $ac_status" >&5
++  echo "$as_me:1995: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1998: \$? = $ac_status" >&5
++  echo "$as_me:2001: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2007,7 +2010,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2010 "configure"
++#line 2013 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2020,16 +2023,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2026: \$? = $ac_status" >&5
++  echo "$as_me:2029: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2032: \$? = $ac_status" >&5
++  echo "$as_me:2035: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2039,7 +2042,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2042 "configure"
++#line 2045 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2051,16 +2054,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2057: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2057: \$? = $ac_status" >&5
++  echo "$as_me:2060: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2063: \$? = $ac_status" >&5
++  echo "$as_me:2066: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2090,11 +2093,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2093: checking version of $CC" >&5
++	echo "$as_me:2096: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version| 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:2097: result: $GCC_VERSION" >&5
++	echo "$as_me:2100: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2104,7 +2107,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:2107: checking how to run the C preprocessor" >&5
++echo "$as_me:2110: 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
+@@ -2125,18 +2128,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 2128 "configure"
++#line 2131 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2136: \"$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:2139: \$? = $ac_status" >&5
++  echo "$as_me:2142: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2159,17 +2162,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2162 "configure"
++#line 2165 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2169: \"$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:2172: \$? = $ac_status" >&5
++  echo "$as_me:2175: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2206,7 +2209,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2209: result: $CPP" >&5
++echo "$as_me:2212: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2216,18 +2219,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 2219 "configure"
++#line 2222 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2227: \"$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:2230: \$? = $ac_status" >&5
++  echo "$as_me:2233: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2250,17 +2253,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2253 "configure"
++#line 2256 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2260: \"$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:2263: \$? = $ac_status" >&5
++  echo "$as_me:2266: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2288,7 +2291,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2294: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2301,14 +2304,14 @@
+ ac_main_return=return
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2307: 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 2311 "configure"
++#line 2314 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -2323,7 +2326,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 2326 "configure"
++#line 2329 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -2336,14 +2339,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2342: 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:2346: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2349: 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
+@@ -2359,15 +2362,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:2362: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2365: \$? = $ac_status" >&5
++  echo "$as_me:2368: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2370: \$? = $ac_status" >&5
++  echo "$as_me:2373: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -2378,19 +2381,19 @@
+ 
+ fi
+ if test $cf_cv_prog_CC_c_o = yes; then
+-  echo "$as_me:2381: result: yes" >&5
++  echo "$as_me:2384: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:2384: result: no" >&5
++  echo "$as_me:2387: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:2388: checking for POSIXized ISC" >&5
++echo "$as_me:2391: 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:2393: result: yes" >&5
++  echo "$as_me:2396: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   ISC=yes # If later tests want to check for ISC.
+ 
+@@ -2404,12 +2407,12 @@
+     CC="$CC -Xp"
+   fi
+ else
+-  echo "$as_me:2407: result: no" >&5
++  echo "$as_me:2410: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   ISC=
+ fi
+ 
+-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "$as_me:2415: 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
+@@ -2503,7 +2506,7 @@
+ fi
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 2506 "configure"
++#line 2509 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef CC_HAS_PROTOS
+@@ -2524,16 +2527,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2530: \$? = $ac_status" >&5
++  echo "$as_me:2533: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2536: \$? = $ac_status" >&5
++  echo "$as_me:2539: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ansi_cc="$cf_arg"; break
+ else
+@@ -2546,7 +2549,7 @@
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+ fi
+-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2552: result: $cf_cv_ansi_cc" >&5
+ echo "${ECHO_T}$cf_cv_ansi_cc" >&6
+ 
+ if test "$cf_cv_ansi_cc" != "no"; then
+@@ -2629,7 +2632,7 @@
+ fi
+ 
+ if test "$cf_cv_ansi_cc" = "no"; then
+-	{ { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
++	{ { echo "$as_me:2635: 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
+@@ -2663,13 +2666,13 @@
+   LDCONFIG=:
+ else
+ case "$cf_cv_system_name" in #(vi
+-freebsd*) #(vi
++dragonfly*|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:2672: checking for $ac_word" >&5
++echo "$as_me:2675: 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
+@@ -2686,7 +2689,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:2689: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2692: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2697,10 +2700,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:2700: result: $LDCONFIG" >&5
++  echo "$as_me:2703: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:2703: result: no" >&5
++  echo "$as_me:2706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2708,7 +2711,7 @@
+ esac
+ fi
+ 
+-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2714: 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.
+@@ -2718,7 +2721,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:2721: result: $cf_with_cxx" >&5
++echo "$as_me:2724: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -2736,7 +2739,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:2739: checking for $ac_word" >&5
++echo "$as_me:2742: 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
+@@ -2751,7 +2754,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:2754: found $ac_dir/$ac_word" >&5
++echo "$as_me:2757: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2759,10 +2762,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:2762: result: $CXX" >&5
++  echo "$as_me:2765: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:2765: result: no" >&5
++  echo "$as_me:2768: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2775,7 +2778,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:2778: checking for $ac_word" >&5
++echo "$as_me:2781: 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
+@@ -2790,7 +2793,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:2793: found $ac_dir/$ac_word" >&5
++echo "$as_me:2796: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2798,10 +2801,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
++  echo "$as_me:2804: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:2804: result: no" >&5
++  echo "$as_me:2807: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2813,32 +2816,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:2816:" \
++echo "$as_me:2819:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2822: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2822: \$? = $ac_status" >&5
++  echo "$as_me:2825: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2827: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2827: \$? = $ac_status" >&5
++  echo "$as_me:2830: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2832: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2832: \$? = $ac_status" >&5
++  echo "$as_me:2835: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:2838: 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 2841 "configure"
++#line 2844 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2853,16 +2856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2859: \$? = $ac_status" >&5
++  echo "$as_me:2862: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2865: \$? = $ac_status" >&5
++  echo "$as_me:2868: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2874,19 +2877,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2880: 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:2883: checking whether $CXX accepts -g" >&5
++echo "$as_me:2886: 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 2889 "configure"
++#line 2892 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2898,16 +2901,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2904: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2904: \$? = $ac_status" >&5
++  echo "$as_me:2907: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2910: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2910: \$? = $ac_status" >&5
++  echo "$as_me:2913: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -2917,7 +2920,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:2923: 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
+@@ -2944,7 +2947,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2947 "configure"
++#line 2950 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2957,16 +2960,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2963: \$? = $ac_status" >&5
++  echo "$as_me:2966: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2969: \$? = $ac_status" >&5
++  echo "$as_me:2972: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2976,7 +2979,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2979 "configure"
++#line 2982 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2988,16 +2991,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2994: \$? = $ac_status" >&5
++  echo "$as_me:2997: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3000: \$? = $ac_status" >&5
++  echo "$as_me:3003: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -3024,7 +3027,7 @@
+ 	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:3027: checking for $ac_word" >&5
++echo "$as_me:3030: 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
+@@ -3041,7 +3044,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:3044: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3047: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3052,16 +3055,16 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3055: result: $CXX" >&5
++  echo "$as_me:3058: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3058: result: no" >&5
++  echo "$as_me:3061: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	if test "$CXX" = "g++" ; then
+-		{ echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
++		{ echo "$as_me:3067: WARNING: ignoring hardcoded g++" >&5
+ echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
+ 		cf_with_cxx=no; CXX=""; GXX="";
+ 	fi
+@@ -3069,11 +3072,11 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3072: checking version of g++" >&5
++	echo "$as_me:3075: checking version of g++" >&5
+ echo $ECHO_N "checking version of 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:3076: result: $GXX_VERSION" >&5
++	echo "$as_me:3079: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3081,12 +3084,12 @@
+ 1*|2.[0-6]*)
+ 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
+ 	# cf_cxx_library=no
+-	{ echo "$as_me:3084: WARNING: templates do not work" >&5
++	{ echo "$as_me:3087: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3092: 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.
+@@ -3096,10 +3099,10 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3102: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3102: checking if you want to build with Ada95" >&5
++echo "$as_me:3105: 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.
+@@ -3109,10 +3112,23 @@
+ else
+   cf_with_ada=yes
+ fi;
+-echo "$as_me:3112: result: $cf_with_ada" >&5
++echo "$as_me:3115: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
++echo "$as_me:3118: 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.
++if test "${with_manpages+set}" = set; then
++  withval="$with_manpages"
++  cf_with_manpages=$withval
++else
++  cf_with_manpages=yes
++fi;
++echo "$as_me:3128: result: $cf_with_manpages" >&5
++echo "${ECHO_T}$cf_with_manpages" >&6
++
++echo "$as_me:3131: 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.
+@@ -3122,10 +3138,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3125: result: $cf_with_progs" >&5
++echo "$as_me:3141: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:3128: checking if you wish to install curses.h" >&5
++echo "$as_me:3144: 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.
+@@ -3135,7 +3151,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3138: result: $with_curses_h" >&5
++echo "$as_me:3154: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3161,7 +3177,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:3164: checking for $ac_word" >&5
++echo "$as_me:3180: 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
+@@ -3176,7 +3192,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
++echo "$as_me:3195: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3184,21 +3200,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3187: result: $AWK" >&5
++  echo "$as_me:3203: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3190: result: no" >&5
++  echo "$as_me:3206: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3213: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3201: checking for egrep" >&5
++echo "$as_me:3217: 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
+@@ -3208,11 +3224,11 @@
+     else ac_cv_prog_egrep='egrep'
+     fi
+ fi
+-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3227: 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:3215: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:3231: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3228,7 +3244,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:3231: checking for a BSD compatible install" >&5
++echo "$as_me:3247: 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
+@@ -3277,7 +3293,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3280: result: $INSTALL" >&5
++echo "$as_me:3296: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3302,7 +3318,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:3305: checking for $ac_word" >&5
++echo "$as_me:3321: 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
+@@ -3317,7 +3333,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
++echo "$as_me:3336: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3325,28 +3341,28 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3328: result: $LINT" >&5
++  echo "$as_me:3344: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3331: result: no" >&5
++  echo "$as_me:3347: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$LINT" && break
+ done
+ 
+-echo "$as_me:3338: checking whether ln -s works" >&5
++echo "$as_me:3354: 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:3342: result: yes" >&5
++  echo "$as_me:3358: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3345: result: no, using $LN_S" >&5
++  echo "$as_me:3361: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3349: checking for long file names" >&5
++echo "$as_me:3365: 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
+@@ -3385,7 +3401,7 @@
+   rm -rf $ac_xdir 2>/dev/null
+ done
+ fi
+-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3404: 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
+ 
+@@ -3395,7 +3411,136 @@
+ 
+ fi
+ 
+-echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5
++# if we find pkg-config, check if we should install the ".pc" files.
++
++echo "$as_me:3416: 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.
++if test "${with_pkg_config+set}" = set; then
++  withval="$with_pkg_config"
++  cf_pkg_config=$withval
++else
++  cf_pkg_config=yes
++fi;
++echo "$as_me:3426: result: $cf_pkg_config" >&5
++echo "${ECHO_T}$cf_pkg_config" >&6
++
++case $cf_pkg_config in
++no)
++	PKG_CONFIG=none
++	;;
++yes)
++	# 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:3436: 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
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  ac_save_IFS=$IFS; IFS=$ac_path_separator
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  if $as_executable_p "$ac_dir/$ac_word"; then
++   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++   echo "$as_me:3453: found $ac_dir/$ac_word" >&5
++   break
++fi
++done
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++  echo "$as_me:3465: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++  echo "$as_me:3468: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	;;
++*)
++	PKG_CONFIG=$withval
++	;;
++esac
++
++test -z "$PKG_CONFIG" && PKG_CONFIG=none
++if test "$PKG_CONFIG" != none ; then
++
++if test "x$prefix" != xNONE; then
++  cf_path_syntax="$prefix"
++else
++  cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$PKG_CONFIG" in #(vi
++.\$\(*\)*|.\'*\'*) #(vi
++  ;;
++..|./*|.\\*) #(vi
++  ;;
++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
++  ;;
++.\${*prefix}*) #(vi
++  eval PKG_CONFIG="$PKG_CONFIG"
++  case ".$PKG_CONFIG" in #(vi
++  .NONE/*)
++    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
++    ;;
++  esac
++  ;; #(vi
++.no|.NONE/*)
++  PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
++  ;;
++*)
++  { { echo "$as_me:3506: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
++   { (exit 1); exit 1; }; }
++  ;;
++esac
++
++fi
++
++if test "$PKG_CONFIG" != no ; then
++	echo "$as_me:3515: 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
++
++	# 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
++
++	if 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
++else
++  enable_pc_files=no
++fi;
++		echo "$as_me:3532: result: $enable_pc_files" >&5
++echo "${ECHO_T}$enable_pc_files" >&6
++	else
++		echo "$as_me:3535: result: no" >&5
++echo "${ECHO_T}no" >&6
++		{ echo "$as_me:3537: 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:3543: 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.
+@@ -3405,11 +3550,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3408: result: $enable_mixedcase" >&5
++echo "$as_me:3553: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3557: 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
+@@ -3436,7 +3581,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3584: 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
+@@ -3453,7 +3598,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3601: 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
+@@ -3473,18 +3618,18 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3476: result: yes" >&5
++  echo "$as_me:3621: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3480: result: no" >&5
++  echo "$as_me:3625: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+ # Extract the first word of "ctags", so it can be a program name with args.
+ set dummy ctags; ac_word=$2
+-echo "$as_me:3487: checking for $ac_word" >&5
++echo "$as_me:3632: 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
+@@ -3499,7 +3644,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:3502: found $ac_dir/$ac_word" >&5
++echo "$as_me:3647: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3508,17 +3653,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3656: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3514: result: no" >&5
++  echo "$as_me:3659: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "etags", so it can be a program name with args.
+ set dummy etags; ac_word=$2
+-echo "$as_me:3521: checking for $ac_word" >&5
++echo "$as_me:3666: 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
+@@ -3533,7 +3678,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:3536: found $ac_dir/$ac_word" >&5
++echo "$as_me:3681: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3542,10 +3687,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3690: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3548: result: no" >&5
++  echo "$as_me:3693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3565,7 +3710,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3568: checking for makeflags variable" >&5
++echo "$as_me:3713: 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
+@@ -3599,13 +3744,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
++echo "$as_me:3747: 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:3608: checking for $ac_word" >&5
++echo "$as_me:3753: 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
+@@ -3620,7 +3765,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:3623: found $ac_dir/$ac_word" >&5
++echo "$as_me:3768: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3628,10 +3773,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:3631: result: $RANLIB" >&5
++  echo "$as_me:3776: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:3634: result: no" >&5
++  echo "$as_me:3779: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3640,7 +3785,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:3643: checking for $ac_word" >&5
++echo "$as_me:3788: 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
+@@ -3655,7 +3800,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:3658: found $ac_dir/$ac_word" >&5
++echo "$as_me:3803: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3664,10 +3809,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3812: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:3670: result: no" >&5
++  echo "$as_me:3815: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3679,7 +3824,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:3682: checking for $ac_word" >&5
++echo "$as_me:3827: 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
+@@ -3694,7 +3839,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:3697: found $ac_dir/$ac_word" >&5
++echo "$as_me:3842: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3702,10 +3847,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:3705: result: $LD" >&5
++  echo "$as_me:3850: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:3708: result: no" >&5
++  echo "$as_me:3853: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3714,7 +3859,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:3717: checking for $ac_word" >&5
++echo "$as_me:3862: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3729,7 +3874,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:3732: found $ac_dir/$ac_word" >&5
++echo "$as_me:3877: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3738,10 +3883,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:3741: result: $ac_ct_LD" >&5
++  echo "$as_me:3886: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:3744: result: no" >&5
++  echo "$as_me:3889: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3753,7 +3898,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:3756: checking for $ac_word" >&5
++echo "$as_me:3901: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3768,7 +3913,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:3771: found $ac_dir/$ac_word" >&5
++echo "$as_me:3916: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3776,10 +3921,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:3779: result: $AR" >&5
++  echo "$as_me:3924: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:3782: result: no" >&5
++  echo "$as_me:3927: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3788,7 +3933,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:3791: checking for $ac_word" >&5
++echo "$as_me:3936: 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
+@@ -3803,7 +3948,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:3806: found $ac_dir/$ac_word" >&5
++echo "$as_me:3951: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3812,10 +3957,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:3815: result: $ac_ct_AR" >&5
++  echo "$as_me:3960: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:3818: result: no" >&5
++  echo "$as_me:3963: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3824,25 +3969,123 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-if test "${cf_cv_subst_AR_OPTS+set}" = set; then
++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:3975: 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
+ else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar"
++echo "$as_me:3990: found $ac_dir/$ac_word" >&5
++break
++done
+ 
+-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
+-echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  echo "$as_me:3998: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6
++else
++  echo "$as_me:4001: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ 
+-if test -z "$AR_OPTS" ; then
+-	AR_OPTS=rv
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++echo "$as_me:4010: 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
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar"
++echo "$as_me:4025: found $ac_dir/$ac_word" >&5
++break
++done
+ 
++  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
++fi
+ fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  echo "$as_me:4034: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6
++else
++  echo "$as_me:4037: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AR=$ac_ct_AR
++else
++  AR="$ac_cv_prog_AR"
++fi
++
++echo "$as_me:4046: checking for options to update archives" >&5
++echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
++if test "${cf_cv_ar_flags+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++	cf_cv_ar_flags=unknown
++	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
++	do
++		rm -f conftest.$ac_cv_objext
++		rm -f conftest.a
++
++		cat >conftest.$ac_ext <<EOF
++#line 4059 "configure"
++int	testdata[3] = { 123, 456, 789 };
++EOF
++		if { (eval echo "$as_me:4062: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:4065: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
++			if test -f conftest.a ; then
++				cf_cv_ar_flags=$cf_ar_flags
++				break
++			fi
++		else
++			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-cf_cv_subst_AR_OPTS=$AR_OPTS
+-echo "$as_me:3840: result: $AR_OPTS" >&5
+-echo "${ECHO_T}$AR_OPTS" >&6
++echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
++
++			break
++		fi
++	done
++	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+ 
+ fi
++echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
++echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
++ARFLAGS=$cf_cv_ar_flags
++
++echo "$as_me:4088: 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.
+@@ -3855,7 +4098,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:3858: result: $DESTDIR" >&5
++echo "$as_me:4101: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -3883,7 +4126,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:3886: checking for $ac_word" >&5
++echo "$as_me:4129: 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
+@@ -3898,7 +4141,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:3901: found $ac_dir/$ac_word" >&5
++echo "$as_me:4144: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3906,10 +4149,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:3909: result: $BUILD_CC" >&5
++  echo "$as_me:4152: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:3912: result: no" >&5
++  echo "$as_me:4155: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3917,12 +4160,12 @@
+ done
+ 
+ fi;
+-	echo "$as_me:3920: checking for native build C compiler" >&5
++	echo "$as_me:4163: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:3922: result: $BUILD_CC" >&5
++	echo "$as_me:4165: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:3925: checking for native build C preprocessor" >&5
++	echo "$as_me:4168: 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.
+@@ -3932,10 +4175,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:3935: result: $BUILD_CPP" >&5
++	echo "$as_me:4178: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:3938: checking for native build C flags" >&5
++	echo "$as_me:4181: 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.
+@@ -3943,10 +4186,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4189: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4192: 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.
+@@ -3954,10 +4197,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4200: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:3960: checking for native build linker-flags" >&5
++	echo "$as_me:4203: 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.
+@@ -3965,10 +4208,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4211: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:3971: checking for native build linker-libraries" >&5
++	echo "$as_me:4214: 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.
+@@ -3976,7 +4219,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:3979: result: $BUILD_LIBS" >&5
++	echo "$as_me:4222: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -3986,7 +4229,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+-		{ { echo "$as_me:3989: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4232: 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;}
+@@ -4027,7 +4270,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
++echo "$as_me:4273: 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.
+@@ -4037,11 +4280,11 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:4040: result: $with_libtool" >&5
++echo "$as_me:4283: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+- 	if test "$with_libtool" != "yes" ; then
++	if test "$with_libtool" != "yes" ; then
+ 
+ if test "x$prefix" != xNONE; then
+   cf_path_syntax="$prefix"
+@@ -4068,7 +4311,7 @@
+   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
++  { { echo "$as_me:4314: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -4076,9 +4319,9 @@
+ 
+ 		LIBTOOL=$with_libtool
+ 	else
+- 		# Extract the first word of "libtool", so it can be a program name with args.
++		# Extract the first word of "libtool", so it can be a program name with args.
+ set dummy libtool; ac_word=$2
+-echo "$as_me:4081: checking for $ac_word" >&5
++echo "$as_me:4324: 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
+@@ -4095,7 +4338,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:4098: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4341: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4106,19 +4349,19 @@
+ LIBTOOL=$ac_cv_path_LIBTOOL
+ 
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:4109: result: $LIBTOOL" >&5
++  echo "$as_me:4352: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:4112: result: no" >&5
++  echo "$as_me:4355: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+- 	fi
+- 	if test -z "$LIBTOOL" ; then
+- 		{ { echo "$as_me:4118: error: Cannot find libtool" >&5
++	fi
++	if test -z "$LIBTOOL" ; then
++		{ { echo "$as_me:4361: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+- 	fi
++	fi
+ 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+@@ -4130,17 +4373,17 @@
+ 	LIB_PREP=:
+ 
+ 	# Show the version of libtool
+-	echo "$as_me:4133: checking version of libtool" >&5
++	echo "$as_me:4376: 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:4140: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:4383: 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:4143: error: This is not GNU libtool" >&5
++		{ { echo "$as_me:4386: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -4168,7 +4411,7 @@
+ 
+ else
+ 
+-echo "$as_me:4171: checking if you want to build shared libraries" >&5
++echo "$as_me:4414: 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.
+@@ -4178,11 +4421,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4181: result: $with_shared" >&5
++echo "$as_me:4424: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4185: checking if you want to build static libraries" >&5
++echo "$as_me:4428: 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.
+@@ -4192,11 +4435,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:4195: result: $with_normal" >&5
++echo "$as_me:4438: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
+ 
+-echo "$as_me:4199: checking if you want to build debug libraries" >&5
++echo "$as_me:4442: 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.
+@@ -4206,11 +4449,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:4209: result: $with_debug" >&5
++echo "$as_me:4452: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
+ 
+-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
++echo "$as_me:4456: 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.
+@@ -4220,7 +4463,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:4223: result: $with_profile" >&5
++echo "$as_me:4466: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -4228,19 +4471,19 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:4231: checking for specified models" >&5
++echo "$as_me:4474: 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:4235: result: $cf_list_models" >&5
++echo "$as_me:4478: 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:4240: checking for default model" >&5
++echo "$as_me:4483: 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:4243: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4486: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -4269,7 +4512,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:4515: 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.
+@@ -4279,10 +4522,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:4282: result: $with_termlib" >&5
++echo "$as_me:4525: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
++echo "$as_me:4528: 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.
+@@ -4292,13 +4535,13 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:4295: result: $with_ticlib" >&5
++echo "$as_me:4538: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:4544: 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.
+@@ -4308,27 +4551,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:4311: result: $with_gpm" >&5
++echo "$as_me:4554: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:4315: checking for gpm.h" >&5
++	echo "$as_me:4558: 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 4321 "configure"
++#line 4564 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4568: \"$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:4331: \$? = $ac_status" >&5
++  echo "$as_me:4574: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4347,7 +4590,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:4593: 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
+ 
+@@ -4358,14 +4601,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}:4361: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me-configure}:4604: testing assuming we really have GPM library ..." 1>&5
+ 
+ 			cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+ 		else
+-			echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:4611: 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
+@@ -4373,7 +4616,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4376 "configure"
++#line 4619 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4392,16 +4635,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4398: \$? = $ac_status" >&5
++  echo "$as_me:4641: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4404: \$? = $ac_status" >&5
++  echo "$as_me:4647: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -4412,13 +4655,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:4658: 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:4421: error: Cannot link with GPM library" >&5
++				{ { echo "$as_me:4664: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -4428,7 +4671,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:4674: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -4437,7 +4680,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:4683: 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.
+@@ -4447,18 +4690,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:4450: result: $with_dlsym" >&5
++	echo "$as_me:4693: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "$with_dlsym" = yes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:4455: checking for dlsym" >&5
++echo "$as_me:4698: 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 4461 "configure"
++#line 4704 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char dlsym (); below.  */
+@@ -4489,16 +4732,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4735: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4495: \$? = $ac_status" >&5
++  echo "$as_me:4738: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4501: \$? = $ac_status" >&5
++  echo "$as_me:4744: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -4508,14 +4751,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:4754: 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:4518: checking for dlsym in -ldl" >&5
++echo "$as_me:4761: 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
+@@ -4523,7 +4766,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4526 "configure"
++#line 4769 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4542,16 +4785,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4548: \$? = $ac_status" >&5
++  echo "$as_me:4791: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4554: \$? = $ac_status" >&5
++  echo "$as_me:4797: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -4562,7 +4805,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:4808: 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
+ 
+@@ -4575,10 +4818,10 @@
+ if test "$cf_have_dlsym" = yes ; then
+ 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
+ 
+-	echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:4821: 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 4581 "configure"
++#line 4824 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -4596,16 +4839,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4602: \$? = $ac_status" >&5
++  echo "$as_me:4845: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4608: \$? = $ac_status" >&5
++  echo "$as_me:4851: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cat >>confdefs.h <<\EOF
+@@ -4616,15 +4859,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ 
+-		{ { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:4862: 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:4624: result: ok" >&5
++	echo "$as_me:4867: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:4627: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:4870: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -4632,12 +4875,12 @@
+ 		if test "$with_gpm" != yes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me-configure}:4878: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:4640: checking for soname of gpm library" >&5
++echo "$as_me:4883: 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
+@@ -4655,15 +4898,15 @@
+ CF_EOF
+ cf_save_LIBS="$LIBS"
+ 	LIBS="-lgpm $LIBS"
+-	if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4661: \$? = $ac_status" >&5
++  echo "$as_me:4904: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:4906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4666: \$? = $ac_status" >&5
++  echo "$as_me:4909: \$? = $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
+@@ -4674,7 +4917,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:4920: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -4690,7 +4933,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:4936: 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
+@@ -4698,7 +4941,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4701 "configure"
++#line 4944 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4717,16 +4960,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4723: \$? = $ac_status" >&5
++  echo "$as_me:4966: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4729: \$? = $ac_status" >&5
++  echo "$as_me:4972: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -4737,11 +4980,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:4983: 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:4744: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:4987: 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
+@@ -4765,15 +5008,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:4768: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4771: \$? = $ac_status" >&5
++  echo "$as_me:5014: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:5016: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4776: \$? = $ac_status" >&5
++  echo "$as_me:5019: \$? = $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
+@@ -4785,11 +5028,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:5031: 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:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:5035: 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
+ 
+@@ -4799,7 +5042,7 @@
+ 
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:4802: checking if you want to use sysmouse" >&5
++echo "$as_me:5045: 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.
+@@ -4811,7 +5054,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4814 "configure"
++#line 5057 "configure"
+ #include "confdefs.h"
+ 
+ #include <osreldate.h>
+@@ -4834,16 +5077,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5080: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4840: \$? = $ac_status" >&5
++  echo "$as_me:5083: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4846: \$? = $ac_status" >&5
++  echo "$as_me:5089: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -4853,7 +5096,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	fi
+-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
++echo "$as_me:5099: 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
+@@ -4871,7 +5114,7 @@
+ 	test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:4874: checking for default loader flags" >&5
++echo "$as_me:5117: 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=''   ;;
+@@ -4880,13 +5123,13 @@
+ profile) LD_MODEL='-pg';;
+ shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:4883: result: $LD_MODEL" >&5
++echo "$as_me:5126: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case $DFT_LWR_MODEL in
+ shared)
+ 
+-echo "$as_me:4889: checking if rpath option should be used" >&5
++echo "$as_me:5132: 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.
+@@ -4896,10 +5139,10 @@
+ else
+   cf_cv_ld_rpath=no
+ fi;
+-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
++echo "$as_me:5142: result: $cf_cv_ld_rpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_rpath" >&6
+ 
+-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5145: 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.
+@@ -4909,19 +5152,20 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
++echo "$as_me:5155: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+ 
+ 	LOCAL_LDFLAGS=
+ 	LOCAL_LDFLAGS2=
++	LD_RPATH_OPT=
+ 	LD_SHARED_OPTS=
+ 	INSTALL_LIB="-m 644"
+ 
+ 	cf_cv_do_symlinks=no
+ 
+-	echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:5168: 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.
+@@ -4936,7 +5180,7 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	*)
+-		{ { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
++		{ { echo "$as_me:5183: 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; }; }
+ 		;;
+@@ -4945,7 +5189,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:5192: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -4954,14 +5198,14 @@
+ 	CC_SHARED_OPTS=
+ 	if test "$GCC" = yes
+ 	then
+-		echo "$as_me:4957: checking which $CC option to use" >&5
++		echo "$as_me:5201: 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 4964 "configure"
++#line 5208 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4973,16 +5217,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5220: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4979: \$? = $ac_status" >&5
++  echo "$as_me:5223: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4985: \$? = $ac_status" >&5
++  echo "$as_me:5229: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -4991,7 +5235,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		done
+-		echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:5238: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -4999,6 +5243,12 @@
+ 	cf_cv_shlib_version_infix=no
+ 
+ 	case $cf_cv_system_name in
++	aix[56]*)
++		if test "$GCC" = yes; then
++			CC_SHARED_OPTS=
++			MK_SHARED_LIB="$(CC) -shared"
++		fi
++		;;
+ 	beos*)
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
+ 		;;
+@@ -5027,7 +5277,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:5030: checking if ld -search_paths_first works" >&5
++		echo "$as_me:5280: 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
+@@ -5036,7 +5286,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 5039 "configure"
++#line 5289 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5048,16 +5298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5054: \$? = $ac_status" >&5
++  echo "$as_me:5304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5060: \$? = $ac_status" >&5
++  echo "$as_me:5310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -5068,7 +5318,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:5321: 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"
+@@ -5090,10 +5340,10 @@
+ 	irix*)
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+ 			if test "$GCC" = yes; then
+-				cf_ld_rpath_opt="-Wl,-rpath,"
++				LD_RPATH_OPT="-Wl,-rpath,"
+ 				EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 			else
+-				cf_ld_rpath_opt="-rpath "
++				LD_RPATH_OPT="-rpath "
+ 				EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 			fi
+ 		fi
+@@ -5112,7 +5362,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 
+@@ -5131,7 +5381,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+@@ -5143,7 +5393,7 @@
+ 		cf_cv_shared_soname='`basename $@`'
+ 	fi
+ 
+-		MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
++		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+ 		;;
+ 	nto-qnx*|openbsd*|freebsd[12].*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+@@ -5155,7 +5405,7 @@
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
+-			cf_ld_rpath_opt="-rpath "
++			LD_RPATH_OPT="-rpath "
+ 			EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 
+@@ -5166,11 +5416,11 @@
+ 		cf_cv_shared_soname='`basename $@`'
+ 	fi
+ 
+-		MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $@` -o $@'
++		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@'
+ 		;;
+ 	netbsd*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+-		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
++		test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+@@ -5192,7 +5442,7 @@
+ 
+ 			MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
+ 		else
+-			MK_SHARED_LIB='${LD} -Bshareable -o $@'
++			MK_SHARED_LIB='${LD} -shared -Bshareable -o $@'
+ 		fi
+ 		;;
+ 	osf*|mls+*)
+@@ -5211,7 +5461,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-rpath"
++			LD_RPATH_OPT="-rpath"
+ 			# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 		cf_cv_rm_so_locs=yes
+@@ -5246,7 +5496,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-R"
++			LD_RPATH_OPT="-R"
+ 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 
+@@ -5258,7 +5508,43 @@
+ 	fi
+ 
+ 		if test "$GCC" != yes; then
+-			CC_SHARED_OPTS='-xcode=pic32'
++			cf_save_CFLAGS="$CFLAGS"
++			for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
++			do
++				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
++				cat >conftest.$ac_ext <<_ACEOF
++#line 5516 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++int
++main ()
++{
++printf("Hello\n");
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:5528: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:5531: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:5534: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:5537: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++			done
++			CFLAGS="$cf_save_CFLAGS"
++			CC_SHARED_OPTS=$cf_shared_opts
+ 			MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
+ 		else
+ 			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+@@ -5285,20 +5571,20 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		*)
+-			{ echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:5574: 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
+-		echo "$as_me:5296: checking if we need a space after rpath option" >&5
++	if test -n "$LD_RPATH_OPT" ; then
++		echo "$as_me:5582: 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="$LIBS ${cf_ld_rpath_opt}$libdir"
++		LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5301 "configure"
++#line 5587 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5310,16 +5596,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5316: \$? = $ac_status" >&5
++  echo "$as_me:5602: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5322: \$? = $ac_status" >&5
++  echo "$as_me:5608: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -5329,16 +5615,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:5332: result: $cf_rpath_space" >&5
++		echo "$as_me:5618: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+-		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
+-		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
++		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
++		MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
+ 	fi
+ 
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+ 	for model in $cf_list_models; do
+ 		if test "$model" = "shared"; then
+-			{ { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:5627: 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
+@@ -5348,7 +5634,7 @@
+ ###############################################################################
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:5637: 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.
+@@ -5358,10 +5644,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:5361: result: $with_overwrite" >&5
++echo "$as_me:5647: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:5364: checking if external terminfo-database is used" >&5
++echo "$as_me:5650: 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.
+@@ -5371,7 +5657,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:5374: result: $use_database" >&5
++echo "$as_me:5660: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case $host_os in #(vi
+@@ -5393,7 +5679,7 @@
+ #define USE_DATABASE 1
+ EOF
+ 
+-	echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:5682: 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 --enable-database or --disable-database was given.
+@@ -5401,10 +5687,10 @@
+   enableval="$enable_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:5404: result: $TERMINFO_SRC" >&5
++	echo "$as_me:5690: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:5693: 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.
+@@ -5414,13 +5700,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:5417: result: $with_hashed_db" >&5
++	echo "$as_me:5703: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:5423: checking for list of fallback descriptions" >&5
++echo "$as_me:5709: 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.
+@@ -5430,11 +5716,11 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:5433: result: $with_fallback" >&5
++echo "$as_me:5719: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
+ 
+-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
++echo "$as_me:5723: 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.
+@@ -5448,7 +5734,7 @@
+ no)	with_xterm_new=xterm-old;;
+ *)	with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:5451: result: $with_xterm_new" >&5
++echo "$as_me:5737: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -5458,7 +5744,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:5461: checking for list of terminfo directories" >&5
++echo "$as_me:5747: checking for list of terminfo directories" >&5
+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
+ 
+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
+@@ -5498,7 +5784,7 @@
+   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:5787: 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; }; }
+   ;;
+@@ -5511,13 +5797,13 @@
+ 
+ eval 'TERMINFO_DIRS="$cf_dst_path"'
+ 
+-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
++echo "$as_me:5800: 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:5520: checking for default terminfo directory" >&5
++echo "$as_me:5806: 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.
+@@ -5553,7 +5839,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:5842: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -5562,7 +5848,7 @@
+ fi
+ TERMINFO="$withval"
+ 
+-echo "$as_me:5565: result: $TERMINFO" >&5
++echo "$as_me:5851: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ cat >>confdefs.h <<EOF
+ #define TERMINFO "$TERMINFO"
+@@ -5572,7 +5858,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:5575: checking if big-core option selected" >&5
++echo "$as_me:5861: 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.
+@@ -5584,7 +5870,7 @@
+   with_big_core=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5587 "configure"
++#line 5873 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -5598,15 +5884,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5887: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5604: \$? = $ac_status" >&5
++  echo "$as_me:5890: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5609: \$? = $ac_status" >&5
++  echo "$as_me:5895: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_big_core=yes
+ else
+@@ -5618,7 +5904,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:5621: result: $with_big_core" >&5
++echo "$as_me:5907: 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
+@@ -5627,7 +5913,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:5630: checking if big-strings option selected" >&5
++echo "$as_me:5916: 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.
+@@ -5636,29 +5922,29 @@
+   with_big_strings=$enableval
+ else
+ 
+-    case x$AWK in #(vi
+-    x)
+-        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
+-            eval with_big_strings=yes
+-        else
+-            eval with_big_strings=no
+-        fi
+-        ;;
+-    esac
++	case x$AWK in #(vi
++	x)
++		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
++			eval with_big_strings=yes
++		else
++			eval with_big_strings=no
++		fi
++		;;
++	esac
+ 
+ fi;
+-echo "$as_me:5654: result: $with_big_strings" >&5
++echo "$as_me:5940: 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:5661: checking if you want termcap-fallback support" >&5
++echo "$as_me:5947: 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.
+@@ -5668,13 +5954,13 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:5671: result: $with_termcap" >&5
++echo "$as_me:5957: 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:5677: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:5963: 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
+@@ -5686,7 +5972,7 @@
+ else
+ 
+ if test "$with_ticlib" != no ; then
+-	{ { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++	{ { echo "$as_me:5975: 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
+@@ -5695,7 +5981,7 @@
+ #define USE_TERMCAP 1
+ EOF
+ 
+-echo "$as_me:5698: checking for list of termcap files" >&5
++echo "$as_me:5984: 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.
+@@ -5735,7 +6021,7 @@
+   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:6024: 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; }; }
+   ;;
+@@ -5748,14 +6034,14 @@
+ 
+ eval 'TERMPATH="$cf_dst_path"'
+ 
+-echo "$as_me:5751: result: $TERMPATH" >&5
++echo "$as_me:6037: 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:5758: checking if fast termcap-loader is needed" >&5
++echo "$as_me:6044: 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.
+@@ -5765,13 +6051,13 @@
+ else
+   with_getcap=no
+ fi;
+-echo "$as_me:5768: result: $with_getcap" >&5
++echo "$as_me:6054: 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:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
++echo "$as_me:6060: 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.
+@@ -5781,7 +6067,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-echo "$as_me:5784: result: $with_getcap_cache" >&5
++echo "$as_me:6070: 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
+@@ -5790,7 +6076,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:6079: 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.
+@@ -5800,13 +6086,13 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:5803: result: $with_home_terminfo" >&5
++echo "$as_me:6089: 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:5809: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:6095: 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.
+@@ -5816,7 +6102,7 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:5819: result: $with_root_environ" >&5
++echo "$as_me:6105: 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
+@@ -5830,13 +6116,13 @@
+ 	unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:5833: checking for $ac_func" >&5
++echo "$as_me:6119: 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 5839 "configure"
++#line 6125 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5867,16 +6153,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5873: \$? = $ac_status" >&5
++  echo "$as_me:6159: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5879: \$? = $ac_status" >&5
++  echo "$as_me:6165: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5886,7 +6172,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6175: 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
+@@ -5903,13 +6189,13 @@
+ 		symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:5906: checking for $ac_func" >&5
++echo "$as_me:6192: 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 5912 "configure"
++#line 6198 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5940,16 +6226,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5946: \$? = $ac_status" >&5
++  echo "$as_me:6232: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5952: \$? = $ac_status" >&5
++  echo "$as_me:6238: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5959,7 +6245,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6248: 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
+@@ -5970,7 +6256,7 @@
+ done
+ 
+ else
+-	echo "$as_me:5973: checking if link/symlink functions work" >&5
++	echo "$as_me:6259: 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
+@@ -5983,7 +6269,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5986 "configure"
++#line 6272 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -6013,15 +6299,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6019: \$? = $ac_status" >&5
++  echo "$as_me:6305: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6024: \$? = $ac_status" >&5
++  echo "$as_me:6310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -6039,7 +6325,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
++echo "$as_me:6328: 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
+@@ -6057,7 +6343,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:6060: checking if tic should use symbolic links" >&5
++    echo "$as_me:6346: 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.
+@@ -6067,21 +6353,21 @@
+ else
+   with_symlinks=no
+ fi;
+-    echo "$as_me:6070: result: $with_symlinks" >&5
++    echo "$as_me:6356: 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:6077: checking if tic should use hard links" >&5
++    echo "$as_me:6363: 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:6084: result: $with_links" >&5
++    echo "$as_me:6370: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -6094,7 +6380,7 @@
+ EOF
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+-echo "$as_me:6097: checking if you want broken-linker support code" >&5
++echo "$as_me:6383: 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.
+@@ -6104,7 +6390,7 @@
+ else
+   with_broken_linker=${BROKEN_LINKER-no}
+ fi;
+-echo "$as_me:6107: result: $with_broken_linker" >&5
++echo "$as_me:6393: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ BROKEN_LINKER=0
+@@ -6124,14 +6410,14 @@
+ 		BROKEN_LINKER=1
+ 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
+ 
+-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me-configure}:6413: 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:6134: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:6420: 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.
+@@ -6141,7 +6427,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:6144: result: $with_bsdpad" >&5
++echo "$as_me:6430: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
+ #define BSD_TPUTS 1
+@@ -6158,7 +6444,7 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
++echo "$as_me:6447: checking if $CC -U and -D options work together" >&5
+ echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
+ if test "${cf_cv_cc_u_d_options+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6167,7 +6453,7 @@
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6170 "configure"
++#line 6456 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6186,16 +6472,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6192: \$? = $ac_status" >&5
++  echo "$as_me:6478: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6198: \$? = $ac_status" >&5
++  echo "$as_me:6484: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_cc_u_d_options=yes
+@@ -6209,14 +6495,14 @@
+ 	CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+ fi
+-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
++echo "$as_me:6498: result: $cf_cv_cc_u_d_options" >&5
+ echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
+ 
+ cf_XOPEN_SOURCE=500
+ cf_POSIX_C_SOURCE=199506L
+ 
+ case $host_os in #(vi
+-aix[45]*) #(vi
++aix[456]*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+ 	;;
+ freebsd*|dragonfly*) #(vi
+@@ -6233,16 +6519,16 @@
+ irix[56].*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+ 	;;
+-linux*|gnu*|k*bsd*-gnu) #(vi
++linux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 
+-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:6524: 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 6245 "configure"
++#line 6531 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6257,16 +6543,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6263: \$? = $ac_status" >&5
++  echo "$as_me:6549: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6269: \$? = $ac_status" >&5
++  echo "$as_me:6555: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -6275,7 +6561,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 6278 "configure"
++#line 6564 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6290,16 +6576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6296: \$? = $ac_status" >&5
++  echo "$as_me:6582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6302: \$? = $ac_status" >&5
++  echo "$as_me:6588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -6314,7 +6600,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
++echo "$as_me:6603: 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"
+ 
+@@ -6341,14 +6627,14 @@
+ 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+ 	;;
+ *)
+-	echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
++	echo "$as_me:6630: 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 6351 "configure"
++#line 6637 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6363,16 +6649,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6652: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6369: \$? = $ac_status" >&5
++  echo "$as_me:6655: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6658: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6375: \$? = $ac_status" >&5
++  echo "$as_me:6661: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -6381,7 +6667,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 6384 "configure"
++#line 6670 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6396,16 +6682,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6402: \$? = $ac_status" >&5
++  echo "$as_me:6688: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6408: \$? = $ac_status" >&5
++  echo "$as_me:6694: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -6420,7 +6706,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
++echo "$as_me:6709: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 	if test "$cf_cv_xopen_source" != no ; then
+ 
+@@ -6454,16 +6740,16 @@
+ 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:6743: 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}:6463: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me-configure}:6749: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6466 "configure"
++#line 6752 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6478,16 +6764,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6767: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6484: \$? = $ac_status" >&5
++  echo "$as_me:6770: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6490: \$? = $ac_status" >&5
++  echo "$as_me:6776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -6508,7 +6794,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6511 "configure"
++#line 6797 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6523,16 +6809,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6812: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6529: \$? = $ac_status" >&5
++  echo "$as_me:6815: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6535: \$? = $ac_status" >&5
++  echo "$as_me:6821: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6543,15 +6829,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me-configure}:6832: 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}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me-configure}:6837: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 6554 "configure"
++#line 6840 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6566,16 +6852,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6855: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6572: \$? = $ac_status" >&5
++  echo "$as_me:6858: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6578: \$? = $ac_status" >&5
++  echo "$as_me:6864: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6591,7 +6877,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:6880: 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
+@@ -6610,14 +6896,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:6613: checking if SIGWINCH is defined" >&5
++echo "$as_me:6899: 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 6620 "configure"
++#line 6906 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -6632,23 +6918,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6638: \$? = $ac_status" >&5
++  echo "$as_me:6924: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6644: \$? = $ac_status" >&5
++  echo "$as_me:6930: \$? = $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 6651 "configure"
++#line 6937 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6666,16 +6952,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6672: \$? = $ac_status" >&5
++  echo "$as_me:6958: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6678: \$? = $ac_status" >&5
++  echo "$as_me:6964: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6689,11 +6975,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6978: 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:6696: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6982: 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
+@@ -6704,7 +6990,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6707 "configure"
++#line 6993 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6726,16 +7012,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6732: \$? = $ac_status" >&5
++  echo "$as_me:7018: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6738: \$? = $ac_status" >&5
++  echo "$as_me:7024: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6749,7 +7035,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:7038: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6759,13 +7045,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
++  echo "$as_me:7048: 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 6768 "configure"
++#line 7054 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -6777,16 +7063,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7066: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6783: \$? = $ac_status" >&5
++  echo "$as_me:7069: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6789: \$? = $ac_status" >&5
++  echo "$as_me:7075: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6797,7 +7083,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:7086: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+   if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -6811,7 +7097,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:6814: checking if you want wide-character code" >&5
++echo "$as_me:7100: 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.
+@@ -6821,7 +7107,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:6824: result: $with_widec" >&5
++echo "$as_me:7110: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "$with_widec" = yes ; then
+ 	LIB_SUFFIX="w${LIB_SUFFIX}"
+@@ -6829,10 +7115,10 @@
+ #define USE_WIDEC_SUPPORT 1
+ EOF
+ 
+-echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:7118: 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 6835 "configure"
++#line 7121 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -6848,16 +7134,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7137: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6854: \$? = $ac_status" >&5
++  echo "$as_me:7140: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6860: \$? = $ac_status" >&5
++  echo "$as_me:7146: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -6866,16 +7152,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:6869: result: $cf_result" >&5
++echo "$as_me:7155: 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:6875: checking checking for compatible value versus " >&5
++	echo "$as_me:7161: 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 6878 "configure"
++#line 7164 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -6891,16 +7177,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6897: \$? = $ac_status" >&5
++  echo "$as_me:7183: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6903: \$? = $ac_status" >&5
++  echo "$as_me:7189: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6909,7 +7195,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:6912: result: $cf_result" >&5
++	echo "$as_me:7198: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -6923,13 +7209,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:6926: checking for $ac_func" >&5
++echo "$as_me:7212: 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 6932 "configure"
++#line 7218 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6960,16 +7246,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:7252: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6972: \$? = $ac_status" >&5
++  echo "$as_me:7258: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -6979,7 +7265,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7268: 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
+@@ -6991,7 +7277,7 @@
+ 
+ 	if test "$ac_cv_func_putwc" != yes ; then
+ 
+-echo "$as_me:6994: checking for multibyte character support" >&5
++echo "$as_me:7280: 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
+@@ -6999,7 +7285,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7002 "configure"
++#line 7288 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7012,16 +7298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7018: \$? = $ac_status" >&5
++  echo "$as_me:7304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7024: \$? = $ac_status" >&5
++  echo "$as_me:7310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7033,10 +7319,10 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me-configure}:7322: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7039 "configure"
++#line 7325 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7049,16 +7335,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7055: \$? = $ac_status" >&5
++  echo "$as_me:7341: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7061: \$? = $ac_status" >&5
++  echo "$as_me:7347: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_find_linkage_utf8=yes
+ else
+@@ -7067,12 +7353,41 @@
+ 
+     cf_cv_find_linkage_utf8=no
+ 
+-echo "${as_me-configure}:7070: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++    test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
++
++echo "${as_me-configure}:7358: testing find linkage for utf8 library ..." 1>&5
++
++echo "${as_me-configure}:7360: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+     cf_save_CPPFLAGS="$CPPFLAGS"
+     cf_test_CPPFLAGS="$CPPFLAGS"
+ 
+-    cf_search=""
++cf_header_path_list=""
++if test -n "${CFLAGS}${CPPFLAGS}" ; then
++	for cf_header_path in $CPPFLAGS $CFLAGS
++	do
++		case $cf_header_path in #(vi
++		-I*)
++			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
++
++test "$cf_header_path" != "NONE" && \
++test -d "$cf_header_path" && \
++ {
++	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
++	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
++	test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
++	test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
++	test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
++	test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
++}
++
++			cf_header_path_list="$cf_header_path_list $cf_search"
++			;;
++		esac
++	done
++fi
++
++cf_search=""
+ 
+ test "/usr" != "$prefix" && \
+ test -d "/usr" && \
+@@ -7143,16 +7458,18 @@
+ 	test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+ }
+ 
++cf_search="$cf_header_path_list $cf_search"
++
+     for cf_cv_header_path_utf8 in $cf_search
+     do
+       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}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7468: 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 7155 "configure"
++#line 7472 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7165,21 +7482,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7171: \$? = $ac_status" >&5
++  echo "$as_me:7488: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7177: \$? = $ac_status" >&5
++  echo "$as_me:7494: \$? = $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}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7499: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+             cf_cv_find_linkage_utf8=maybe
+             cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7197,13 +7514,39 @@
+ 
+     if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me-configure}:7517: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+       cf_save_LIBS="$LIBS"
+       cf_save_LDFLAGS="$LDFLAGS"
+ 
+       if test "$cf_cv_find_linkage_utf8" != yes ; then
+-        cf_search=""
++
++cf_library_path_list=""
++if test -n "${LDFLAGS}${LIBS}" ; then
++	for cf_library_path in $LDFLAGS $LIBS
++	do
++		case $cf_library_path in #(vi
++		-L*)
++			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
++
++test "$cf_library_path" != "NONE" && \
++test -d "$cf_library_path" && \
++ {
++	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
++	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
++	test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
++	test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
++	test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
++	test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
++}
++
++			cf_library_path_list="$cf_library_path_list $cf_search"
++			;;
++		esac
++	done
++fi
++
++cf_search=""
+ 
+ test "/usr" != "$prefix" && \
+ test -d "/usr" && \
+@@ -7260,18 +7603,20 @@
+ 	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
+ }
+ 
++cf_search="$cf_library_path_list $cf_search"
++
+         for cf_cv_library_path_utf8 in $cf_search
+         do
+           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}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7613: 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 7274 "configure"
++#line 7619 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7284,21 +7629,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7290: \$? = $ac_status" >&5
++  echo "$as_me:7635: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7296: \$? = $ac_status" >&5
++  echo "$as_me:7641: \$? = $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}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7646: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+                 cf_cv_find_linkage_utf8=yes
+                 cf_cv_library_file_utf8="-lutf8"
+@@ -7336,7 +7681,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7684: 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
+@@ -7364,13 +7709,13 @@
+ 		fi
+ 
+ 		if test "$cf_have_incdir" = no ; then
+-          if test "$cf_add_incdir" = /usr/local/include ; then
++		  if test "$cf_add_incdir" = /usr/local/include ; then
+ 			if test "$GCC" = yes
+ 			then
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7373 "configure"
++#line 7718 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7382,16 +7727,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7388: \$? = $ac_status" >&5
++  echo "$as_me:7733: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7394: \$? = $ac_status" >&5
++  echo "$as_me:7739: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7408,13 +7753,13 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+ 
+-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+-          test "$cf_top_incdir" = "$cf_add_incdir" && break
+-          cf_add_incdir="$cf_top_incdir"
++		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
++		  test "$cf_top_incdir" = "$cf_add_incdir" && break
++		  cf_add_incdir="$cf_top_incdir"
+ 		else
+ 		  break
+ 		fi
+@@ -7442,7 +7787,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}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me-configure}:7790: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -7459,14 +7804,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:7807: 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 7469 "configure"
++#line 7814 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7484,23 +7829,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7832: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7490: \$? = $ac_status" >&5
++  echo "$as_me:7835: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7496: \$? = $ac_status" >&5
++  echo "$as_me:7841: \$? = $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 7503 "configure"
++#line 7848 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7519,16 +7864,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7525: \$? = $ac_status" >&5
++  echo "$as_me:7870: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7531: \$? = $ac_status" >&5
++  echo "$as_me:7876: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -7540,7 +7885,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:7888: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -7557,14 +7902,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:7905: 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 7567 "configure"
++#line 7912 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7582,23 +7927,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7588: \$? = $ac_status" >&5
++  echo "$as_me:7933: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7594: \$? = $ac_status" >&5
++  echo "$as_me:7939: \$? = $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 7601 "configure"
++#line 7946 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7617,16 +7962,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7965: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7623: \$? = $ac_status" >&5
++  echo "$as_me:7968: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7629: \$? = $ac_status" >&5
++  echo "$as_me:7974: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -7638,7 +7983,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
++echo "$as_me:7986: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -7660,14 +8005,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:8008: 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 7670 "configure"
++#line 8015 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7685,23 +8030,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7691: \$? = $ac_status" >&5
++  echo "$as_me:8036: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7697: \$? = $ac_status" >&5
++  echo "$as_me:8042: \$? = $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 7704 "configure"
++#line 8049 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7720,16 +8065,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8068: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7726: \$? = $ac_status" >&5
++  echo "$as_me:8071: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7732: \$? = $ac_status" >&5
++  echo "$as_me:8077: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -7741,7 +8086,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7744: result: $cf_cv_wint_t" >&5
++echo "$as_me:8089: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -7780,7 +8125,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:8128: 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.
+@@ -7790,7 +8135,7 @@
+ else
+   with_lp64=$default_with_lp64
+ fi;
+-echo "$as_me:7793: result: $with_lp64" >&5
++echo "$as_me:8138: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "$with_lp64" = yes ; then
+@@ -7806,7 +8151,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:8154: 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
+@@ -7818,7 +8163,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 7821 "configure"
++#line 8166 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -7838,16 +8183,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8186: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7844: \$? = $ac_status" >&5
++  echo "$as_me:8189: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7850: \$? = $ac_status" >&5
++  echo "$as_me:8195: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -7857,16 +8202,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7863: \$? = $ac_status" >&5
++  echo "$as_me:8208: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7869: \$? = $ac_status" >&5
++  echo "$as_me:8214: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -7880,13 +8225,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:8228: 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:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:8234: 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
+@@ -7894,7 +8239,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7897 "configure"
++#line 8242 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -7914,16 +8259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7920: \$? = $ac_status" >&5
++  echo "$as_me:8265: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7926: \$? = $ac_status" >&5
++  echo "$as_me:8271: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -7932,7 +8277,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7935 "configure"
++#line 8280 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -7953,16 +8298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8301: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7959: \$? = $ac_status" >&5
++  echo "$as_me:8304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7965: \$? = $ac_status" >&5
++  echo "$as_me:8310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -7973,7 +8318,7 @@
+   break
+ done
+ fi
+-echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:8321: 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
+ 
+@@ -7983,7 +8328,7 @@
+ 
+ fi
+ rm -f conftest*
+-  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:8331: 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
+@@ -7991,7 +8336,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7994 "configure"
++#line 8339 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -8011,16 +8356,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8017: \$? = $ac_status" >&5
++  echo "$as_me:8362: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8023: \$? = $ac_status" >&5
++  echo "$as_me:8368: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -8029,7 +8374,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8032 "configure"
++#line 8377 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -8050,16 +8395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8056: \$? = $ac_status" >&5
++  echo "$as_me:8401: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8062: \$? = $ac_status" >&5
++  echo "$as_me:8407: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -8070,7 +8415,7 @@
+   break
+ done
+ fi
+-echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:8418: 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
+ 
+@@ -8083,7 +8428,7 @@
+ fi
+ 
+     if test "$enable_largefile" != no ; then
+-	echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:8431: 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
+@@ -8091,7 +8436,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8094 "configure"
++#line 8439 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8103,16 +8448,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8109: \$? = $ac_status" >&5
++  echo "$as_me:8454: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8115: \$? = $ac_status" >&5
++  echo "$as_me:8460: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -8121,7 +8466,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8124 "configure"
++#line 8469 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -8134,16 +8479,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8485: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8146: \$? = $ac_status" >&5
++  echo "$as_me:8491: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -8154,7 +8499,7 @@
+   break
+ done
+ fi
+-echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:8502: 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
+ 
+@@ -8168,13 +8513,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:8171: checking for fseeko" >&5
++echo "$as_me:8516: 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 8177 "configure"
++#line 8522 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8186,16 +8531,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8192: \$? = $ac_status" >&5
++  echo "$as_me:8537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8198: \$? = $ac_status" >&5
++  echo "$as_me:8543: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -8205,7 +8550,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:8553: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -8226,14 +8571,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:8229: checking whether to use struct dirent64" >&5
++	echo "$as_me:8574: 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 8236 "configure"
++#line 8581 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -8254,16 +8599,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8260: \$? = $ac_status" >&5
++  echo "$as_me:8605: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8266: \$? = $ac_status" >&5
++  echo "$as_me:8611: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -8274,7 +8619,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:8622: 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
+@@ -8283,7 +8628,7 @@
+     fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:8631: 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.
+@@ -8293,14 +8638,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:8296: result: $with_tparm_varargs" >&5
++echo "$as_me:8641: 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:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:8648: 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.
+@@ -8310,14 +8655,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:8313: result: $with_tic_depends" >&5
++echo "$as_me:8658: 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:8320: checking for type of bool" >&5
++echo "$as_me:8665: 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.
+@@ -8327,10 +8672,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:8330: result: $NCURSES_BOOL" >&5
++echo "$as_me:8675: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
++echo "$as_me:8678: 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.
+@@ -8341,11 +8686,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
++echo "$as_me:8689: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:8348: checking for type of chtype" >&5
++echo "$as_me:8693: 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.
+@@ -8355,11 +8700,11 @@
+ else
+   NCURSES_CHTYPE=auto
+ fi;
+-echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:8703: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:8362: checking for type of ospeed" >&5
++echo "$as_me:8707: 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.
+@@ -8369,11 +8714,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
++echo "$as_me:8717: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:8376: checking for type of mmask_t" >&5
++echo "$as_me:8721: 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.
+@@ -8383,11 +8728,11 @@
+ else
+   NCURSES_MMASK_T=auto
+ fi;
+-echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:8731: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:8735: 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.
+@@ -8397,7 +8742,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:8400: result: $with_rcs_ids" >&5
++echo "$as_me:8745: 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
+@@ -8405,7 +8750,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:8408: checking format of man-pages" >&5
++echo "$as_me:8753: 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.
+@@ -8494,14 +8839,14 @@
+   ;;
+ esac
+ 
+-echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:8842: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
++  { echo "$as_me:8845: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:8504: checking for manpage renaming" >&5
++echo "$as_me:8849: 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.
+@@ -8529,7 +8874,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:8532: error: not a filename: $MANPAGE_RENAMES" >&5
++    { { echo "$as_me:8877: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+@@ -8543,10 +8888,10 @@
+   fi
+ fi
+ 
+-echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:8891: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:8549: checking if manpage aliases will be installed" >&5
++echo "$as_me:8894: 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.
+@@ -8557,7 +8902,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:8905: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ if test "$LN_S" = "ln -s"; then
+@@ -8568,7 +8913,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:8571: checking if manpage symlinks should be used" >&5
++echo "$as_me:8916: 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.
+@@ -8581,17 +8926,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:8584: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:8929: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:8935: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:8594: checking for manpage tbl" >&5
++echo "$as_me:8939: 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.
+@@ -8602,7 +8947,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:8605: result: $MANPAGE_TBL" >&5
++echo "$as_me:8950: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+   if test "$prefix" = "NONE" ; then
+@@ -8718,7 +9063,7 @@
+ 		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
+ CF_EOF
+ 
+-	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
++	for cf_name in  captoinfo clear infocmp infotocap tabs tic toe tput tset
+ 	do
+ 		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 		cf_name=`echo $cf_name|sed "$program_transform_name"`
+@@ -8913,7 +9258,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:8916: checking if you want to build with function extensions" >&5
++echo "$as_me:9261: 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.
+@@ -8923,7 +9268,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:8926: result: $with_ext_funcs" >&5
++echo "$as_me:9271: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -8955,12 +9300,14 @@
+ #define NCURSES_EXT_FUNCS 1
+ EOF
+ 
++	GENERATED_EXT_FUNCS=generated
+ else
+ 	NCURSES_EXT_FUNCS=0
++	GENERATED_EXT_FUNCS=
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:8963: checking for extended use of const keyword" >&5
++echo "$as_me:9310: 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.
+@@ -8970,7 +9317,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:8973: result: $with_ext_const" >&5
++echo "$as_me:9320: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -8978,7 +9325,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:8981: checking if you want to use extended colors" >&5
++echo "$as_me:9328: 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.
+@@ -8988,12 +9335,12 @@
+ else
+   with_ext_colors=no
+ fi;
+-echo "$as_me:8991: result: $with_ext_colors" >&5
++echo "$as_me:9338: 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:8996: error: This option applies only to wide-character library" >&5
++		{ { echo "$as_me:9343: 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
+@@ -9004,7 +9351,7 @@
+ 	5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:9354: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -9019,7 +9366,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:9369: 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.
+@@ -9029,7 +9376,7 @@
+ else
+   with_ext_mouse=no
+ fi;
+-echo "$as_me:9032: result: $with_ext_mouse" >&5
++echo "$as_me:9379: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "$with_ext_mouse" = yes ; then
+@@ -9040,7 +9387,7 @@
+ 	5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:9390: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -9048,7 +9395,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:9398: 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.
+@@ -9058,19 +9405,19 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:9061: result: $with_no_padding" >&5
++echo "$as_me:9408: 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:9067: checking for ANSI C header files" >&5
++echo "$as_me:9414: 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 9073 "configure"
++#line 9420 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -9078,13 +9425,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9428: \"$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:9087: \$? = $ac_status" >&5
++  echo "$as_me:9434: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9106,7 +9453,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 9109 "configure"
++#line 9456 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -9124,7 +9471,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 9127 "configure"
++#line 9474 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -9145,7 +9492,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9148 "configure"
++#line 9495 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -9171,15 +9518,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9177: \$? = $ac_status" >&5
++  echo "$as_me:9524: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9182: \$? = $ac_status" >&5
++  echo "$as_me:9529: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9192,7 +9539,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
++echo "$as_me:9542: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -9208,28 +9555,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9211: checking for $ac_header" >&5
++echo "$as_me:9558: 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 9217 "configure"
++#line 9564 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9226: \$? = $ac_status" >&5
++  echo "$as_me:9573: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9232: \$? = $ac_status" >&5
++  echo "$as_me:9579: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -9239,7 +9586,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:9589: 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
+@@ -9249,13 +9596,13 @@
+ fi
+ done
+ 
+-echo "$as_me:9252: checking for signed char" >&5
++echo "$as_me:9599: 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 9258 "configure"
++#line 9605 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9270,16 +9617,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9620: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9276: \$? = $ac_status" >&5
++  echo "$as_me:9623: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9282: \$? = $ac_status" >&5
++  echo "$as_me:9629: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -9289,10 +9636,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:9639: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:9295: checking size of signed char" >&5
++echo "$as_me:9642: 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
+@@ -9301,7 +9648,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9304 "configure"
++#line 9651 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9313,21 +9660,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9663: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9319: \$? = $ac_status" >&5
++  echo "$as_me:9666: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9325: \$? = $ac_status" >&5
++  echo "$as_me:9672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 9330 "configure"
++#line 9677 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9339,16 +9686,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9689: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9345: \$? = $ac_status" >&5
++  echo "$as_me:9692: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9351: \$? = $ac_status" >&5
++  echo "$as_me:9698: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -9364,7 +9711,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 9367 "configure"
++#line 9714 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9376,16 +9723,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9726: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9382: \$? = $ac_status" >&5
++  echo "$as_me:9729: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9388: \$? = $ac_status" >&5
++  echo "$as_me:9735: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -9401,7 +9748,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 9404 "configure"
++#line 9751 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9413,16 +9760,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9763: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9419: \$? = $ac_status" >&5
++  echo "$as_me:9766: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9425: \$? = $ac_status" >&5
++  echo "$as_me:9772: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -9435,12 +9782,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:9785: 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 9443 "configure"
++#line 9790 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9456,15 +9803,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9462: \$? = $ac_status" >&5
++  echo "$as_me:9809: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9467: \$? = $ac_status" >&5
++  echo "$as_me:9814: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -9480,7 +9827,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:9830: 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
+@@ -9491,7 +9838,7 @@
+ else
+ 	NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:9841: 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.
+@@ -9501,12 +9848,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:9504: result: $with_signed_char" >&5
++echo "$as_me:9851: 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:9509: checking if you want SIGWINCH handler" >&5
++echo "$as_me:9856: 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.
+@@ -9516,14 +9863,14 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:9519: result: $with_sigwinch" >&5
++echo "$as_me:9866: 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:9526: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:9873: 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.
+@@ -9533,7 +9880,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:9536: result: $with_tcap_names" >&5
++echo "$as_me:9883: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
+@@ -9541,7 +9888,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:9544: checking if you want all development code" >&5
++echo "$as_me:9891: 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.
+@@ -9551,11 +9898,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:9554: result: $with_develop" >&5
++echo "$as_me:9901: 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:9558: checking if you want hard-tabs code" >&5
++echo "$as_me:9905: 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.
+@@ -9565,14 +9912,14 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:9568: result: $enable_hard_tabs" >&5
++echo "$as_me:9915: 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:9575: checking if you want limited support for xmc" >&5
++echo "$as_me:9922: 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.
+@@ -9582,7 +9929,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:9585: result: $enable_xmc_glitch" >&5
++echo "$as_me:9932: 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
+@@ -9591,7 +9938,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:9941: 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.
+@@ -9601,14 +9948,14 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:9604: result: $with_assumed_color" >&5
++echo "$as_me:9951: 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:9611: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:9958: 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.
+@@ -9618,14 +9965,14 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:9621: result: $with_hashmap" >&5
++echo "$as_me:9968: 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:9628: checking if you want colorfgbg code" >&5
++echo "$as_me:9975: 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.
+@@ -9635,7 +9982,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:9638: result: $with_colorfgbg" >&5
++echo "$as_me:9985: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
+ #define USE_COLORFGBG 1
+@@ -9644,7 +9991,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:9647: checking if you want to link with the pthread library" >&5
++echo "$as_me:9994: 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.
+@@ -9654,27 +10001,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:9657: result: $with_pthread" >&5
++echo "$as_me:10004: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-    echo "$as_me:9661: checking for pthread.h" >&5
++    echo "$as_me:10008: 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 9667 "configure"
++#line 10014 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10018: \"$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:9677: \$? = $ac_status" >&5
++  echo "$as_me:10024: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9693,7 +10040,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:10043: 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
+ 
+@@ -9701,12 +10048,12 @@
+ #define HAVE_PTHREADS_H 1
+ EOF
+ 
+-        echo "$as_me:9704: checking if we can link with the pthread library" >&5
++        echo "$as_me:10051: 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 9709 "configure"
++#line 10056 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -9722,16 +10069,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9728: \$? = $ac_status" >&5
++  echo "$as_me:10075: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9734: \$? = $ac_status" >&5
++  echo "$as_me:10081: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -9741,7 +10088,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+         LIBS="$cf_save_LIBS"
+-        echo "$as_me:9744: result: $with_pthread" >&5
++        echo "$as_me:10091: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+         if test "$with_pthread" = yes ; then
+@@ -9751,7 +10098,7 @@
+ EOF
+ 
+         else
+-            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
++            { { echo "$as_me:10101: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+         fi
+@@ -9760,7 +10107,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:10110: 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.
+@@ -9770,18 +10117,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:9773: result: $use_weak_symbols" >&5
++echo "$as_me:10120: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:9777: checking if $CC supports weak symbols" >&5
++echo "$as_me:10124: 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 9784 "configure"
++#line 10131 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -9807,16 +10154,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9813: \$? = $ac_status" >&5
++  echo "$as_me:10160: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9819: \$? = $ac_status" >&5
++  echo "$as_me:10166: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -9827,7 +10174,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:10177: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -9857,7 +10204,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:9860: checking if you want experimental reentrant code" >&5
++echo "$as_me:10207: 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.
+@@ -9867,7 +10214,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:9870: result: $with_reentrant" >&5
++echo "$as_me:10217: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -9891,7 +10238,7 @@
+ 	5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:10241: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -9904,7 +10251,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:10254: 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.
+@@ -9914,7 +10261,7 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:9917: result: $with_safe_sprintf" >&5
++echo "$as_me:10264: 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
+@@ -9923,7 +10270,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:9926: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:10273: 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.
+@@ -9933,7 +10280,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:9936: result: $with_scroll_hints" >&5
++echo "$as_me:10283: 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
+@@ -9941,7 +10288,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
++echo "$as_me:10291: 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.
+@@ -9951,7 +10298,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:9954: result: $with_wgetch_events" >&5
++echo "$as_me:10301: 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
+@@ -9960,7 +10307,7 @@
+ ###############################################################################
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+-echo "$as_me:9963: checking if you want to display full commands during build" >&5
++echo "$as_me:10310: 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
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -9977,11 +10324,11 @@
+ 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
+ 	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
+ fi
+-echo "$as_me:9980: result: $with_echo" >&5
++echo "$as_me:10327: result: $with_echo" >&5
+ echo "${ECHO_T}$with_echo" >&6
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:9984: checking if you want to see compiler warnings" >&5
++echo "$as_me:10331: 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.
+@@ -9989,7 +10336,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:9992: result: $with_warnings" >&5
++echo "$as_me:10339: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -10000,12 +10347,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	linux*|gnu*)
+-		echo "$as_me:10003: checking if this is really Intel C compiler" >&5
++		echo "$as_me:10350: 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 10008 "configure"
++#line 10355 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10022,16 +10369,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10028: \$? = $ac_status" >&5
++  echo "$as_me:10375: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10034: \$? = $ac_status" >&5
++  echo "$as_me:10381: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+@@ -10042,14 +10389,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:10045: result: $INTEL_COMPILER" >&5
++		echo "$as_me:10392: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+ fi
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 10052 "${as_me-configure}"
++#line 10399 "${as_me-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -10067,7 +10414,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:10070: checking for $CC warning options..." >&5
++	{ echo "$as_me:10417: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -10084,12 +10431,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10090: \$? = $ac_status" >&5
++  echo "$as_me:10437: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10439: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -10098,7 +10445,7 @@
+ 
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:10101: checking for $CC warning options..." >&5
++	{ echo "$as_me:10448: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-W -Wall"
+@@ -10118,12 +10465,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:10121: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10124: \$? = $ac_status" >&5
++  echo "$as_me:10471: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10473: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in #(vi
+ 			Wcast-qual) #(vi
+@@ -10134,7 +10481,7 @@
+ 				[34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me-configure}:10484: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -10154,12 +10501,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	linux*|gnu*)
+-		echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:10504: 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 10162 "configure"
++#line 10509 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10176,16 +10523,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10526: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10182: \$? = $ac_status" >&5
++  echo "$as_me:10529: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10532: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10188: \$? = $ac_status" >&5
++  echo "$as_me:10535: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+@@ -10196,7 +10543,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:10546: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -10210,7 +10557,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 10213 "configure"
++#line 10560 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -10228,7 +10575,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:10231: checking for $CC warning options..." >&5
++	{ echo "$as_me:10578: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -10245,12 +10592,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10251: \$? = $ac_status" >&5
++  echo "$as_me:10598: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10600: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -10259,7 +10606,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:10262: checking for $CXX warning options..." >&5
++	{ echo "$as_me:10609: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -10288,16 +10635,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10638: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10294: \$? = $ac_status" >&5
++  echo "$as_me:10641: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10643: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10647: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -10333,10 +10680,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:10683: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 10339 "${as_me-configure}"
++#line 10686 "${as_me-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -10374,12 +10721,12 @@
+ EOF
+ 			;;
+ 		esac
+-		if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10380: \$? = $ac_status" >&5
++  echo "$as_me:10727: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:10729: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 		fi
+@@ -10391,7 +10738,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
++echo "$as_me:10741: 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.
+@@ -10401,7 +10748,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:10404: result: $with_assertions" >&5
++echo "$as_me:10751: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -10419,7 +10766,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:10769: 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.
+@@ -10435,7 +10782,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:10785: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -10519,23 +10866,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:10522: checking for dmalloc.h" >&5
++	echo "$as_me:10869: 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 10528 "configure"
++#line 10875 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10879: \"$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:10538: \$? = $ac_status" >&5
++  echo "$as_me:10885: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10554,11 +10901,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:10904: 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:10561: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:10908: 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
+@@ -10566,7 +10913,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10569 "configure"
++#line 10916 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10585,16 +10932,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10591: \$? = $ac_status" >&5
++  echo "$as_me:10938: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10597: \$? = $ac_status" >&5
++  echo "$as_me:10944: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -10605,7 +10952,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:10955: 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
+@@ -10620,7 +10967,7 @@
+ 
+ fi
+ 
+-echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:10970: 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.
+@@ -10636,7 +10983,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:10986: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -10720,23 +11067,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:10723: checking for dbmalloc.h" >&5
++	echo "$as_me:11070: 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 10729 "configure"
++#line 11076 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11080: \"$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:10739: \$? = $ac_status" >&5
++  echo "$as_me:11086: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10755,11 +11102,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:11105: 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:10762: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:11109: 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
+@@ -10767,7 +11114,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10770 "configure"
++#line 11117 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10786,16 +11133,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10792: \$? = $ac_status" >&5
++  echo "$as_me:11139: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10798: \$? = $ac_status" >&5
++  echo "$as_me:11145: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -10806,7 +11153,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:11156: 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
+@@ -10821,7 +11168,7 @@
+ 
+ fi
+ 
+-echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
++echo "$as_me:11171: 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.
+@@ -10837,7 +11184,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
++echo "$as_me:11187: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -10920,7 +11267,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:11270: 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.
+@@ -10930,7 +11277,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:10933: result: $with_no_leaks" >&5
++echo "$as_me:11280: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -10975,7 +11322,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10978: checking whether to add trace feature to all models" >&5
++echo "$as_me:11325: 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.
+@@ -10985,7 +11332,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:10988: result: $cf_with_trace" >&5
++echo "$as_me:11335: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -11066,13 +11413,13 @@
+ fi
+ 
+ ###	Checks for libraries.
+-echo "$as_me:11069: checking for gettimeofday" >&5
++echo "$as_me:11416: 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 11075 "configure"
++#line 11422 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gettimeofday (); below.  */
+@@ -11103,16 +11450,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11453: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11109: \$? = $ac_status" >&5
++  echo "$as_me:11456: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11115: \$? = $ac_status" >&5
++  echo "$as_me:11462: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -11122,7 +11469,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:11472: 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
+@@ -11131,7 +11478,7 @@
+ 
+ else
+ 
+-echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:11481: 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
+@@ -11139,7 +11486,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11142 "configure"
++#line 11489 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11158,16 +11505,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11508: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11164: \$? = $ac_status" >&5
++  echo "$as_me:11511: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11170: \$? = $ac_status" >&5
++  echo "$as_me:11517: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -11178,7 +11525,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:11528: 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
+@@ -11190,14 +11537,14 @@
+ 
+ fi
+ 
+-echo "$as_me:11193: checking if -lm needed for math functions" >&5
++echo "$as_me:11540: 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 11200 "configure"
++#line 11547 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
+@@ -11212,16 +11559,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11562: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11218: \$? = $ac_status" >&5
++  echo "$as_me:11565: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11224: \$? = $ac_status" >&5
++  echo "$as_me:11571: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -11231,7 +11578,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11234: result: $cf_cv_need_libm" >&5
++echo "$as_me:11581: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -11239,13 +11586,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:11242: checking for ANSI C header files" >&5
++echo "$as_me:11589: 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 11248 "configure"
++#line 11595 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -11253,13 +11600,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11603: \"$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:11262: \$? = $ac_status" >&5
++  echo "$as_me:11609: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11281,7 +11628,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 11284 "configure"
++#line 11631 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -11299,7 +11646,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 11302 "configure"
++#line 11649 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -11320,7 +11667,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11323 "configure"
++#line 11670 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -11346,15 +11693,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11696: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11699: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11357: \$? = $ac_status" >&5
++  echo "$as_me:11704: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -11367,7 +11714,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
++echo "$as_me:11717: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -11380,13 +11727,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:11383: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:11730: 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 11389 "configure"
++#line 11736 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -11401,16 +11748,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11407: \$? = $ac_status" >&5
++  echo "$as_me:11754: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11413: \$? = $ac_status" >&5
++  echo "$as_me:11760: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -11420,7 +11767,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11770: 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
+@@ -11433,7 +11780,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:11436: checking for opendir in -ldir" >&5
++  echo "$as_me:11783: 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
+@@ -11441,7 +11788,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11444 "configure"
++#line 11791 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11460,16 +11807,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11466: \$? = $ac_status" >&5
++  echo "$as_me:11813: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11472: \$? = $ac_status" >&5
++  echo "$as_me:11819: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -11480,14 +11827,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:11830: 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:11490: checking for opendir in -lx" >&5
++  echo "$as_me:11837: 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
+@@ -11495,7 +11842,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11498 "configure"
++#line 11845 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11514,16 +11861,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11520: \$? = $ac_status" >&5
++  echo "$as_me:11867: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11526: \$? = $ac_status" >&5
++  echo "$as_me:11873: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -11534,7 +11881,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:11884: 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"
+@@ -11542,13 +11889,13 @@
+ 
+ fi
+ 
+-echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:11892: 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 11551 "configure"
++#line 11898 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -11564,16 +11911,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11570: \$? = $ac_status" >&5
++  echo "$as_me:11917: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11576: \$? = $ac_status" >&5
++  echo "$as_me:11923: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -11583,7 +11930,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11586: result: $ac_cv_header_time" >&5
++echo "$as_me:11933: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -11593,14 +11940,14 @@
+ 
+ fi
+ 
+-echo "$as_me:11596: checking for regular-expression headers" >&5
++echo "$as_me:11943: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11603 "configure"
++#line 11950 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <regex.h>
+@@ -11618,16 +11965,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11968: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11624: \$? = $ac_status" >&5
++  echo "$as_me:11971: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11630: \$? = $ac_status" >&5
++  echo "$as_me:11977: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_regex="regex.h"
+ else
+@@ -11635,7 +11982,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11638 "configure"
++#line 11985 "configure"
+ #include "confdefs.h"
+ #include <regexp.h>
+ int
+@@ -11650,16 +11997,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12000: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11656: \$? = $ac_status" >&5
++  echo "$as_me:12003: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11662: \$? = $ac_status" >&5
++  echo "$as_me:12009: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_regex="regexp.h"
+ else
+@@ -11669,7 +12016,7 @@
+ 		cf_save_LIBS="$LIBS"
+ 		LIBS="-lgen $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11672 "configure"
++#line 12019 "configure"
+ #include "confdefs.h"
+ #include <regexpr.h>
+ int
+@@ -11684,16 +12031,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12034: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11690: \$? = $ac_status" >&5
++  echo "$as_me:12037: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11696: \$? = $ac_status" >&5
++  echo "$as_me:12043: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_regex="regexpr.h"
+ else
+@@ -11709,7 +12056,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11712: result: $cf_cv_regex" >&5
++echo "$as_me:12059: result: $cf_cv_regex" >&5
+ echo "${ECHO_T}$cf_cv_regex" >&6
+ case $cf_cv_regex in
+ 	regex.h)   cat >>confdefs.h <<\EOF
+@@ -11745,23 +12092,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11748: checking for $ac_header" >&5
++echo "$as_me:12095: 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 11754 "configure"
++#line 12101 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12105: \"$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:11764: \$? = $ac_status" >&5
++  echo "$as_me:12111: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11780,7 +12127,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12130: 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
+@@ -11794,7 +12141,7 @@
+ # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
+ if test "$ISC" = yes ; then
+ 
+-echo "$as_me:11797: checking for main in -lcposix" >&5
++echo "$as_me:12144: 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
+@@ -11802,7 +12149,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11805 "configure"
++#line 12152 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11814,16 +12161,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11820: \$? = $ac_status" >&5
++  echo "$as_me:12167: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11826: \$? = $ac_status" >&5
++  echo "$as_me:12173: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -11834,7 +12181,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:12184: 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
+@@ -11845,7 +12192,7 @@
+ 
+ fi
+ 
+-	echo "$as_me:11848: checking for bzero in -linet" >&5
++	echo "$as_me:12195: 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
+@@ -11853,7 +12200,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11856 "configure"
++#line 12203 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11872,16 +12219,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11878: \$? = $ac_status" >&5
++  echo "$as_me:12225: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11884: \$? = $ac_status" >&5
++  echo "$as_me:12231: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -11892,21 +12239,21 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:12242: 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="$LIBS -linet"
+ fi
+ fi
+ 
+-echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:12249: 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 11909 "configure"
++#line 12256 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -11926,16 +12273,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11932: \$? = $ac_status" >&5
++  echo "$as_me:12279: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11938: \$? = $ac_status" >&5
++  echo "$as_me:12285: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -11947,7 +12294,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:12297: 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
+@@ -11961,7 +12308,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:12311: 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
+@@ -11969,7 +12316,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11972 "configure"
++#line 12319 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -12018,16 +12365,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12024: \$? = $ac_status" >&5
++  echo "$as_me:12371: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12030: \$? = $ac_status" >&5
++  echo "$as_me:12377: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -12044,21 +12391,21 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:12047: result: none needed" >&5
++    echo "$as_me:12394: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:12397: 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:12055: checking for an ANSI C-conforming const" >&5
++echo "$as_me:12402: 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 12061 "configure"
++#line 12408 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12116,16 +12463,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12122: \$? = $ac_status" >&5
++  echo "$as_me:12469: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12128: \$? = $ac_status" >&5
++  echo "$as_me:12475: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -12135,7 +12482,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12138: result: $ac_cv_c_const" >&5
++echo "$as_me:12485: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -12145,7 +12492,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12148: checking for inline" >&5
++echo "$as_me:12495: 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
+@@ -12153,7 +12500,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12156 "configure"
++#line 12503 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -12162,16 +12509,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12168: \$? = $ac_status" >&5
++  echo "$as_me:12515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12174: \$? = $ac_status" >&5
++  echo "$as_me:12521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -12182,7 +12529,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12185: result: $ac_cv_c_inline" >&5
++echo "$as_me:12532: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -12205,7 +12552,7 @@
+     :
+   elif test "$GCC" = yes
+   then
+-    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
++    echo "$as_me:12555: checking if gcc supports options to tune inlining" >&5
+ echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12214,7 +12561,7 @@
+       cf_save_CFLAGS=$CFLAGS
+       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 12217 "configure"
++#line 12564 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -12226,16 +12573,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12232: \$? = $ac_status" >&5
++  echo "$as_me:12579: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12238: \$? = $ac_status" >&5
++  echo "$as_me:12585: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -12247,7 +12594,7 @@
+       CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:12597: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+     if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -12323,7 +12670,7 @@
+   fi
+ fi
+ 
+-echo "$as_me:12326: checking for signal global datatype" >&5
++echo "$as_me:12673: 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
+@@ -12335,7 +12682,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12338 "configure"
++#line 12685 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -12358,16 +12705,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12364: \$? = $ac_status" >&5
++  echo "$as_me:12711: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12370: \$? = $ac_status" >&5
++  echo "$as_me:12717: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -12381,7 +12728,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:12731: 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
+@@ -12389,7 +12736,7 @@
+ 
+ if test $NCURSES_CHTYPE = auto ; then
+ 
+-echo "$as_me:12392: checking for type of chtype" >&5
++echo "$as_me:12739: 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
+@@ -12399,7 +12746,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12402 "configure"
++#line 12749 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -12434,15 +12781,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12440: \$? = $ac_status" >&5
++  echo "$as_me:12787: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12445: \$? = $ac_status" >&5
++  echo "$as_me:12792: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -12457,7 +12804,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:12807: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -12469,14 +12816,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+ 
+-echo "$as_me:12472: checking if unsigned literals are legal" >&5
++echo "$as_me:12819: 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 12479 "configure"
++#line 12826 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12488,16 +12835,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12494: \$? = $ac_status" >&5
++  echo "$as_me:12841: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12500: \$? = $ac_status" >&5
++  echo "$as_me:12847: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -12509,7 +12856,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:12859: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -12525,14 +12872,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:12528: checking if external errno is declared" >&5
++echo "$as_me:12875: 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 12535 "configure"
++#line 12882 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -12550,16 +12897,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12556: \$? = $ac_status" >&5
++  echo "$as_me:12903: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12562: \$? = $ac_status" >&5
++  echo "$as_me:12909: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -12570,7 +12917,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:12920: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -12585,14 +12932,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:12588: checking if external errno exists" >&5
++echo "$as_me:12935: 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 12595 "configure"
++#line 12942 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -12607,16 +12954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12613: \$? = $ac_status" >&5
++  echo "$as_me:12960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12619: \$? = $ac_status" >&5
++  echo "$as_me:12966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -12627,7 +12974,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12630: result: $cf_cv_have_errno" >&5
++echo "$as_me:12977: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -12640,7 +12987,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12643: checking if data-only library module links" >&5
++echo "$as_me:12990: 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
+@@ -12648,20 +12995,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 12651 "configure"
++#line 12998 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12657: \$? = $ac_status" >&5
++  echo "$as_me:13004: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+-		( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
++		( $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 12664 "configure"
++#line 13011 "configure"
+ int	testfunc()
+ {
+ #if defined(NeXT)
+@@ -12674,13 +13021,13 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:13024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12680: \$? = $ac_status" >&5
++  echo "$as_me:13027: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+-		( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
++		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext func.o
+ 	( eval $RANLIB conftest.a ) 2>&5 >/dev/null
+@@ -12690,7 +13037,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12693 "configure"
++#line 13040 "configure"
+ #include "confdefs.h"
+ 
+ 	int main()
+@@ -12701,15 +13048,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13051: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12707: \$? = $ac_status" >&5
++  echo "$as_me:13054: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12712: \$? = $ac_status" >&5
++  echo "$as_me:13059: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -12724,7 +13071,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:13074: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -12759,13 +13106,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12762: checking for $ac_func" >&5
++echo "$as_me:13109: 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 12768 "configure"
++#line 13115 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12796,16 +13143,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13146: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12802: \$? = $ac_status" >&5
++  echo "$as_me:13149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12808: \$? = $ac_status" >&5
++  echo "$as_me:13155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12815,7 +13162,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13165: 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
+@@ -12827,14 +13174,14 @@
+ 
+ if test "$with_getcap" = "yes" ; then
+ 
+-echo "$as_me:12830: checking for terminal-capability database functions" >&5
++echo "$as_me:13177: 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 12837 "configure"
++#line 13184 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12854,16 +13201,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12860: \$? = $ac_status" >&5
++  echo "$as_me:13207: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12866: \$? = $ac_status" >&5
++  echo "$as_me:13213: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -12875,7 +13222,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12878: result: $cf_cv_cgetent" >&5
++echo "$as_me:13225: 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
+@@ -12883,14 +13230,14 @@
+ 
+ fi
+ 
+-echo "$as_me:12886: checking for isascii" >&5
++echo "$as_me:13233: 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 12893 "configure"
++#line 13240 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -12902,16 +13249,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13252: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12908: \$? = $ac_status" >&5
++  echo "$as_me:13255: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12914: \$? = $ac_status" >&5
++  echo "$as_me:13261: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -12922,17 +13269,17 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
++echo "$as_me:13272: 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:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:13279: 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 12935 "configure"
++#line 13282 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -12946,16 +13293,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12952: \$? = $ac_status" >&5
++  echo "$as_me:13299: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12958: \$? = $ac_status" >&5
++  echo "$as_me:13305: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -12963,7 +13310,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12966 "configure"
++#line 13313 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -12978,16 +13325,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12984: \$? = $ac_status" >&5
++  echo "$as_me:13331: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12990: \$? = $ac_status" >&5
++  echo "$as_me:13337: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 	 cat >>confdefs.h <<\EOF
+@@ -13002,11 +13349,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:13005: result: $sigact_bad" >&5
++echo "$as_me:13352: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:13009: checking if nanosleep really works" >&5
++echo "$as_me:13356: 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
+@@ -13016,7 +13363,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13019 "configure"
++#line 13366 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -13041,15 +13388,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13047: \$? = $ac_status" >&5
++  echo "$as_me:13394: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13052: \$? = $ac_status" >&5
++  echo "$as_me:13399: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -13061,7 +13408,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:13411: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
+@@ -13075,23 +13422,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13078: checking for $ac_header" >&5
++echo "$as_me:13425: 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 13084 "configure"
++#line 13431 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13435: \"$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:13094: \$? = $ac_status" >&5
++  echo "$as_me:13441: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13110,7 +13457,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13460: 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
+@@ -13125,23 +13472,23 @@
+ for ac_header in sys/termio.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13128: checking for $ac_header" >&5
++echo "$as_me:13475: 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 13134 "configure"
++#line 13481 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13485: \"$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:13144: \$? = $ac_status" >&5
++  echo "$as_me:13491: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13160,7 +13507,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13510: 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
+@@ -13178,10 +13525,10 @@
+ 	*)	termios_bad=maybe ;;
+ 	esac
+ 	if test "$termios_bad" = maybe ; then
+-	echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
++	echo "$as_me:13528: 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 13184 "configure"
++#line 13531 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -13193,16 +13540,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13199: \$? = $ac_status" >&5
++  echo "$as_me:13546: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13205: \$? = $ac_status" >&5
++  echo "$as_me:13552: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -13210,7 +13557,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 13213 "configure"
++#line 13560 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -13224,16 +13571,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13230: \$? = $ac_status" >&5
++  echo "$as_me:13577: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13236: \$? = $ac_status" >&5
++  echo "$as_me:13583: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -13248,19 +13595,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:13251: result: $termios_bad" >&5
++	echo "$as_me:13598: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:13256: checking for tcgetattr" >&5
++echo "$as_me:13603: 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 13263 "configure"
++#line 13610 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13288,16 +13635,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13294: \$? = $ac_status" >&5
++  echo "$as_me:13641: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13300: \$? = $ac_status" >&5
++  echo "$as_me:13647: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -13307,20 +13654,20 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:13657: 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:13316: checking for vsscanf function or workaround" >&5
++echo "$as_me:13663: 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 13323 "configure"
++#line 13670 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -13336,16 +13683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13342: \$? = $ac_status" >&5
++  echo "$as_me:13689: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13348: \$? = $ac_status" >&5
++  echo "$as_me:13695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -13353,7 +13700,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13356 "configure"
++#line 13703 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -13375,16 +13722,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13381: \$? = $ac_status" >&5
++  echo "$as_me:13728: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13387: \$? = $ac_status" >&5
++  echo "$as_me:13734: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -13392,7 +13739,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13395 "configure"
++#line 13742 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -13414,16 +13761,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13420: \$? = $ac_status" >&5
++  echo "$as_me:13767: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13426: \$? = $ac_status" >&5
++  echo "$as_me:13773: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -13438,7 +13785,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:13788: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in #(vi
+@@ -13456,7 +13803,7 @@
+ ;;
+ esac
+ 
+-echo "$as_me:13459: checking for working mkstemp" >&5
++echo "$as_me:13806: 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
+@@ -13464,13 +13811,13 @@
+ 
+ rm -f conftest*
+ if test "$cross_compiling" = yes; then
+-  echo "$as_me:13467: checking for mkstemp" >&5
++  echo "$as_me:13814: 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 13473 "configure"
++#line 13820 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char mkstemp (); below.  */
+@@ -13501,16 +13848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13507: \$? = $ac_status" >&5
++  echo "$as_me:13854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13513: \$? = $ac_status" >&5
++  echo "$as_me:13860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -13520,12 +13867,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:13870: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13528 "configure"
++#line 13875 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13563,15 +13910,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13569: \$? = $ac_status" >&5
++  echo "$as_me:13916: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13574: \$? = $ac_status" >&5
++  echo "$as_me:13921: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -13586,7 +13933,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:13936: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "$cf_cv_func_mkstemp" = yes ; then
+ 	cat >>confdefs.h <<\EOF
+@@ -13604,21 +13951,21 @@
+ fi
+ 
+ if test "$cross_compiling" = yes ; then
+-	{ echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:13954: 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:13610: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:13957: 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:13616: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:13963: 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 13621 "configure"
++#line 13968 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -13635,15 +13982,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13985: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13641: \$? = $ac_status" >&5
++  echo "$as_me:13988: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13646: \$? = $ac_status" >&5
++  echo "$as_me:13993: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -13656,7 +14003,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:14006: 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
+ 
+@@ -13667,13 +14014,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:13670: checking return type of signal handlers" >&5
++echo "$as_me:14017: 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 13676 "configure"
++#line 14023 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -13695,16 +14042,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13701: \$? = $ac_status" >&5
++  echo "$as_me:14048: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13707: \$? = $ac_status" >&5
++  echo "$as_me:14054: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signal=void
+ else
+@@ -13714,21 +14061,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13717: result: $ac_cv_type_signal" >&5
++echo "$as_me:14064: 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:13724: checking for type sigaction_t" >&5
++echo "$as_me:14071: 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 13731 "configure"
++#line 14078 "configure"
+ #include "confdefs.h"
+ 
+ #include <signal.h>
+@@ -13741,16 +14088,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14091: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13747: \$? = $ac_status" >&5
++  echo "$as_me:14094: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14097: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13753: \$? = $ac_status" >&5
++  echo "$as_me:14100: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -13761,13 +14108,13 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:14111: 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:13770: checking declaration of size-change" >&5
++echo "$as_me:14117: 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
+@@ -13782,7 +14129,7 @@
+     CPPFLAGS="$cf_save_CPPFLAGS"
+     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13785 "configure"
++#line 14132 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -13826,16 +14173,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13832: \$? = $ac_status" >&5
++  echo "$as_me:14179: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13838: \$? = $ac_status" >&5
++  echo "$as_me:14185: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -13854,7 +14201,7 @@
+ done
+ 
+ fi
+-echo "$as_me:13857: result: $cf_cv_sizechange" >&5
++echo "$as_me:14204: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 	cat >>confdefs.h <<\EOF
+@@ -13871,13 +14218,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:13874: checking for memmove" >&5
++echo "$as_me:14221: 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 13880 "configure"
++#line 14227 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char memmove (); below.  */
+@@ -13908,16 +14255,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13914: \$? = $ac_status" >&5
++  echo "$as_me:14261: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13920: \$? = $ac_status" >&5
++  echo "$as_me:14267: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -13927,19 +14274,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
++echo "$as_me:14277: 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:13936: checking for bcopy" >&5
++echo "$as_me:14283: 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 13942 "configure"
++#line 14289 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char bcopy (); below.  */
+@@ -13970,16 +14317,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13976: \$? = $ac_status" >&5
++  echo "$as_me:14323: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13982: \$? = $ac_status" >&5
++  echo "$as_me:14329: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -13989,11 +14336,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:14339: 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:13996: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:14343: 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
+@@ -14003,7 +14350,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14006 "configure"
++#line 14353 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -14017,15 +14364,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14023: \$? = $ac_status" >&5
++  echo "$as_me:14370: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14028: \$? = $ac_status" >&5
++  echo "$as_me:14375: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -14038,7 +14385,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:14388: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -14059,7 +14406,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14062: checking if poll really works" >&5
++echo "$as_me:14409: 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
+@@ -14069,7 +14416,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14072 "configure"
++#line 14419 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14090,15 +14437,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14096: \$? = $ac_status" >&5
++  echo "$as_me:14443: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14101: \$? = $ac_status" >&5
++  echo "$as_me:14448: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -14110,7 +14457,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:14113: result: $cf_cv_working_poll" >&5
++echo "$as_me:14460: 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
+@@ -14118,7 +14465,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:14121: checking for openpty in -lutil" >&5
++echo "$as_me:14468: 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
+@@ -14126,7 +14473,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14129 "configure"
++#line 14476 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14145,16 +14492,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14151: \$? = $ac_status" >&5
++  echo "$as_me:14498: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14157: \$? = $ac_status" >&5
++  echo "$as_me:14504: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -14165,7 +14512,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:14515: 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
+@@ -14173,7 +14520,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:14176: checking for openpty header" >&5
++echo "$as_me:14523: 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
+@@ -14184,7 +14531,7 @@
+     for cf_header in pty.h libutil.h util.h
+     do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 14187 "configure"
++#line 14534 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -14201,16 +14548,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14207: \$? = $ac_status" >&5
++  echo "$as_me:14554: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14213: \$? = $ac_status" >&5
++  echo "$as_me:14560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+         cf_cv_func_openpty=$cf_header
+@@ -14228,7 +14575,7 @@
+     LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
++echo "$as_me:14578: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -14274,13 +14621,13 @@
+ 		fi
+ 
+ 		if test "$cf_have_incdir" = no ; then
+-          if test "$cf_add_incdir" = /usr/local/include ; then
++		  if test "$cf_add_incdir" = /usr/local/include ; then
+ 			if test "$GCC" = yes
+ 			then
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 14283 "configure"
++#line 14630 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14292,16 +14639,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14298: \$? = $ac_status" >&5
++  echo "$as_me:14645: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14304: \$? = $ac_status" >&5
++  echo "$as_me:14651: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14318,13 +14665,13 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+ 
+-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+-          test "$cf_top_incdir" = "$cf_add_incdir" && break
+-          cf_add_incdir="$cf_top_incdir"
++		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
++		  test "$cf_top_incdir" = "$cf_add_incdir" && break
++		  cf_add_incdir="$cf_top_incdir"
+ 		else
+ 		  break
+ 		fi
+@@ -14352,7 +14699,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}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me-configure}:14702: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -14363,23 +14710,23 @@
+     fi
+ esac
+ 
+-echo "$as_me:14366: checking for db.h" >&5
++echo "$as_me:14713: 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 14372 "configure"
++#line 14719 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14723: \"$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:14382: \$? = $ac_status" >&5
++  echo "$as_me:14729: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14398,11 +14745,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
++echo "$as_me:14748: 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:14405: checking for version of db" >&5
++echo "$as_me:14752: 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
+@@ -14413,10 +14760,10 @@
+ for cf_db_version in 1 2 3 4 5
+ do
+ 
+-echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me-configure}:14763: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14419 "configure"
++#line 14766 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14446,16 +14793,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14796: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14452: \$? = $ac_status" >&5
++  echo "$as_me:14799: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14458: \$? = $ac_status" >&5
++  echo "$as_me:14805: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -14469,16 +14816,16 @@
+ done
+ 
+ fi
+-echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:14819: 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:14476: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:14823: 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:14481: checking for db libraries" >&5
++echo "$as_me:14828: 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
+@@ -14492,10 +14839,10 @@
+ 		LIBS="-l$cf_db_libs $LIBS"
+ 	fi
+ 
+-echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me-configure}:14842: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14498 "configure"
++#line 14845 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14550,16 +14897,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14556: \$? = $ac_status" >&5
++  echo "$as_me:14903: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14562: \$? = $ac_status" >&5
++  echo "$as_me:14909: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -14579,11 +14926,11 @@
+ done
+ 
+ fi
+-echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:14929: 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:14586: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:14933: 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
+@@ -14593,7 +14940,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:14596: error: Cannot find db.h" >&5
++	{ { echo "$as_me:14943: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -14608,7 +14955,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:14611: checking if we should include stdbool.h" >&5
++echo "$as_me:14958: 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
+@@ -14616,7 +14963,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14619 "configure"
++#line 14966 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14628,23 +14975,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14634: \$? = $ac_status" >&5
++  echo "$as_me:14981: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14640: \$? = $ac_status" >&5
++  echo "$as_me:14987: \$? = $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 14647 "configure"
++#line 14994 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -14660,16 +15007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14666: \$? = $ac_status" >&5
++  echo "$as_me:15013: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14672: \$? = $ac_status" >&5
++  echo "$as_me:15019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -14683,13 +15030,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:14686: result: yes" >&5
++then	echo "$as_me:15033: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:14688: result: no" >&5
++else	echo "$as_me:15035: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:14692: checking for builtin bool type" >&5
++echo "$as_me:15039: 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
+@@ -14697,7 +15044,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14700 "configure"
++#line 15047 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14712,16 +15059,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15062: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14718: \$? = $ac_status" >&5
++  echo "$as_me:15065: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14724: \$? = $ac_status" >&5
++  echo "$as_me:15071: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -14734,9 +15081,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:14737: result: yes" >&5
++then	echo "$as_me:15084: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:14739: result: no" >&5
++else	echo "$as_me:15086: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -14758,7 +15105,7 @@
+ 	cf_stdcpp_libname=stdc++
+ 	;;
+ esac
+-echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
++echo "$as_me:15108: 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
+@@ -14767,7 +15114,7 @@
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS -l$cf_stdcpp_libname"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14770 "configure"
++#line 15117 "configure"
+ #include "confdefs.h"
+ 
+ #include <strstream.h>
+@@ -14783,16 +15130,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14789: \$? = $ac_status" >&5
++  echo "$as_me:15136: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14795: \$? = $ac_status" >&5
++  echo "$as_me:15142: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -14804,12 +15151,12 @@
+ 	LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:15154: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
+ fi
+ 
+-	echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:15159: 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
+@@ -14825,15 +15172,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:14828: \"$ac_try\"") >&5
++if { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14831: \$? = $ac_status" >&5
++  echo "$as_me:15178: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:15180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14836: \$? = $ac_status" >&5
++  echo "$as_me:15183: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -14844,10 +15191,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:14847: result: yes" >&5
++  echo "$as_me:15194: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:14850: result: no" >&5
++  echo "$as_me:15197: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -14867,12 +15214,12 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:15217: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS -l$cf_gpp_libname"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14875 "configure"
++#line 15222 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -14886,16 +15233,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14892: \$? = $ac_status" >&5
++  echo "$as_me:15239: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14898: \$? = $ac_status" >&5
++  echo "$as_me:15245: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
+@@ -14914,7 +15261,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14917 "configure"
++#line 15264 "configure"
+ #include "confdefs.h"
+ 
+ #include <builtin.h>
+@@ -14928,16 +15275,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15278: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14934: \$? = $ac_status" >&5
++  echo "$as_me:15281: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14940: \$? = $ac_status" >&5
++  echo "$as_me:15287: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
+@@ -14954,7 +15301,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:14957: result: $cf_cxx_library" >&5
++	echo "$as_me:15304: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -14970,7 +15317,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:14973: checking how to run the C++ preprocessor" >&5
++echo "$as_me:15320: 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
+@@ -14987,18 +15334,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 14990 "configure"
++#line 15337 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15342: \"$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:15001: \$? = $ac_status" >&5
++  echo "$as_me:15348: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15021,17 +15368,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15024 "configure"
++#line 15371 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15375: \"$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:15034: \$? = $ac_status" >&5
++  echo "$as_me:15381: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15068,7 +15415,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:15071: result: $CXXCPP" >&5
++echo "$as_me:15418: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -15078,18 +15425,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 15081 "configure"
++#line 15428 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15433: \"$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:15092: \$? = $ac_status" >&5
++  echo "$as_me:15439: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15112,17 +15459,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15115 "configure"
++#line 15462 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15466: \"$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:15125: \$? = $ac_status" >&5
++  echo "$as_me:15472: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15150,7 +15497,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:15500: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -15165,23 +15512,23 @@
+ for ac_header in iostream typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15168: checking for $ac_header" >&5
++echo "$as_me:15515: 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 15174 "configure"
++#line 15521 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15525: \"$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:15184: \$? = $ac_status" >&5
++  echo "$as_me:15531: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15200,7 +15547,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15550: 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
+@@ -15211,10 +15558,10 @@
+ done
+ 
+     if test x"$ac_cv_header_iostream" = xyes ; then
+-        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
++        echo "$as_me:15561: 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 15217 "configure"
++#line 15564 "configure"
+ #include "confdefs.h"
+ 
+ #include <iostream>
+@@ -15231,16 +15578,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15581: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15237: \$? = $ac_status" >&5
++  echo "$as_me:15584: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15243: \$? = $ac_status" >&5
++  echo "$as_me:15590: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -15249,7 +15596,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
++        echo "$as_me:15599: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+         if test "$cf_iostream_namespace" = yes ; then
+             cat >>confdefs.h <<\EOF
+@@ -15259,7 +15606,7 @@
+         fi
+     fi
+ 
+-echo "$as_me:15262: checking if we should include stdbool.h" >&5
++echo "$as_me:15609: 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
+@@ -15267,7 +15614,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15270 "configure"
++#line 15617 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15279,23 +15626,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15285: \$? = $ac_status" >&5
++  echo "$as_me:15632: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15291: \$? = $ac_status" >&5
++  echo "$as_me:15638: \$? = $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 15298 "configure"
++#line 15645 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -15311,16 +15658,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15661: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15317: \$? = $ac_status" >&5
++  echo "$as_me:15664: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15323: \$? = $ac_status" >&5
++  echo "$as_me:15670: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -15334,13 +15681,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:15337: result: yes" >&5
++then	echo "$as_me:15684: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:15339: result: no" >&5
++else	echo "$as_me:15686: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:15343: checking for builtin bool type" >&5
++echo "$as_me:15690: 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
+@@ -15348,7 +15695,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15351 "configure"
++#line 15698 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15363,16 +15710,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15369: \$? = $ac_status" >&5
++  echo "$as_me:15716: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15375: \$? = $ac_status" >&5
++  echo "$as_me:15722: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -15385,13 +15732,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:15388: result: yes" >&5
++then	echo "$as_me:15735: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:15390: result: no" >&5
++else	echo "$as_me:15737: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:15394: checking for size of bool" >&5
++echo "$as_me:15741: 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
+@@ -15402,7 +15749,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15405 "configure"
++#line 15752 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15444,15 +15791,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15794: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15450: \$? = $ac_status" >&5
++  echo "$as_me:15797: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15799: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15455: \$? = $ac_status" >&5
++  echo "$as_me:15802: \$? = $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
+@@ -15470,18 +15817,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:15820: 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:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:15826: 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:15484: checking for special defines needed for etip.h" >&5
++echo "$as_me:15831: 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"
+@@ -15493,7 +15840,7 @@
+ 	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 15496 "configure"
++#line 15843 "configure"
+ #include "confdefs.h"
+ 
+ #include <etip.h.in>
+@@ -15507,16 +15854,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15513: \$? = $ac_status" >&5
++  echo "$as_me:15860: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15519: \$? = $ac_status" >&5
++  echo "$as_me:15866: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -15537,12 +15884,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ done
+-echo "$as_me:15540: result: $cf_result" >&5
++echo "$as_me:15887: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:15892: 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
+@@ -15559,7 +15906,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15562 "configure"
++#line 15909 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -15578,15 +15925,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15584: \$? = $ac_status" >&5
++  echo "$as_me:15931: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15589: \$? = $ac_status" >&5
++  echo "$as_me:15936: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -15605,7 +15952,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:15955: 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
+@@ -15614,7 +15961,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
++echo "$as_me:15964: 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
+@@ -15628,7 +15975,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15631 "configure"
++#line 15978 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -15672,16 +16019,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15678: \$? = $ac_status" >&5
++  echo "$as_me:16025: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15684: \$? = $ac_status" >&5
++  echo "$as_me:16031: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -15699,7 +16046,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:16049: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -15709,12 +16056,12 @@
+ EOF
+ 
+ 	CXX_AR='$(AR)'
+-	CXX_AR_OPTS='$(AR_OPTS)'
++	CXX_ARFLAGS='$(ARFLAGS)'
+ 	case $cf_cv_system_name in #(vi
+ 	irix*) #(vi
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-ar -o'
++		CXX_ARFLAGS='-ar -o'
+ 	    fi
+ 	    ;;
+ 	sco3.2v5*) #(vi
+@@ -15723,7 +16070,7 @@
+ 	solaris2*)
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-xar -o'
++		CXX_ARFLAGS='-xar -o'
+ 	    fi
+ 	    ;;
+ 	esac
+@@ -15747,7 +16094,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:15750: checking for size of bool" >&5
++echo "$as_me:16097: 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
+@@ -15758,7 +16105,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15761 "configure"
++#line 16108 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15800,15 +16147,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16150: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15806: \$? = $ac_status" >&5
++  echo "$as_me:16153: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15811: \$? = $ac_status" >&5
++  echo "$as_me:16158: \$? = $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
+@@ -15826,25 +16173,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:16176: 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:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:16182: 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:15841: checking for fallback type of bool" >&5
++			echo "$as_me:16188: 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:15847: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:16194: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -15873,7 +16220,7 @@
+ 
+ if test "$cf_with_ada" != "no" ; then
+     if test "$with_libtool" != "no"; then
+-	{ echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
++	{ echo "$as_me:16223: 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
+@@ -15883,7 +16230,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:15886: checking for $ac_word" >&5
++echo "$as_me:16233: 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
+@@ -15898,7 +16245,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:15901: found $ac_dir/$ac_word" >&5
++echo "$as_me:16248: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15907,10 +16254,10 @@
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+-  echo "$as_me:15910: result: $gnat_exists" >&5
++  echo "$as_me:16257: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+-  echo "$as_me:15913: result: no" >&5
++  echo "$as_me:16260: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15918,11 +16265,11 @@
+    cf_ada_make=
+ else
+ 
+-echo "$as_me:15921: checking for gnat version" >&5
++echo "$as_me:16268: 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:15925: result: $cf_gnat_version" >&5
++echo "$as_me:16272: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+ 
+ case $cf_gnat_version in
+@@ -15945,7 +16292,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:15948: checking for $ac_word" >&5
++echo "$as_me:16295: 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
+@@ -15960,7 +16307,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:15963: found $ac_dir/$ac_word" >&5
++echo "$as_me:16310: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15969,10 +16316,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:15972: result: $M4_exists" >&5
++  echo "$as_me:16319: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:15975: result: no" >&5
++  echo "$as_me:16322: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15981,7 +16328,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:15984: checking if GNAT works" >&5
++      echo "$as_me:16331: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -f conftest*
+@@ -16009,14 +16356,14 @@
+ fi
+ rm -f conftest*
+ 
+-      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
++      echo "$as_me:16359: 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
+    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
+ 
+-   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
++   echo "$as_me:16366: checking if GNAT pragma Unreferenced works" >&5
+ echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
+ 
+ rm -f conftest*
+@@ -16043,7 +16390,7 @@
+ fi
+ rm -f conftest*
+ 
+-   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
++   echo "$as_me:16393: 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).
+@@ -16096,7 +16443,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:16446: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -16138,7 +16485,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:16488: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -16163,7 +16510,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:16166: checking for library subsets" >&5
++echo "$as_me:16513: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -16188,7 +16535,7 @@
+ test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:16191: result: $LIB_SUBSETS" >&5
++echo "$as_me:16538: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -16226,7 +16573,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:16229: checking default library suffix" >&5
++echo "$as_me:16576: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16237,46 +16584,50 @@
+ 	shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:16587: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:16243: checking default library-dependency suffix" >&5
++echo "$as_me:16590: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+-	case $DFT_LWR_MODEL in
+-	libtool)
++	case $DFT_LWR_MODEL in #(vi
++	libtool) #(vi
+ 		DFT_LIB_SUFFIX='.la'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	normal)
++	normal) #(vi
+ 		DFT_LIB_SUFFIX='.a'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	debug)
++	debug) #(vi
+ 		DFT_LIB_SUFFIX='_g.a'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	profile)
++	profile) #(vi
+ 		DFT_LIB_SUFFIX='_p.a'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			DFT_LIB_SUFFIX='.a'
++			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
++			;;
++		cygwin*) #(vi
+ 			DFT_LIB_SUFFIX='.dll'
+ 			DFT_DEP_SUFFIX='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			DFT_LIB_SUFFIX='.dylib'
+ 			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				DFT_LIB_SUFFIX='.so'
+ 				DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 				;;
+-			*)
++			*) #(vi
+ 				DFT_LIB_SUFFIX='.sl'
+ 				DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 				;;
+@@ -16289,10 +16640,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:16292: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:16643: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:16295: checking default object directory" >&5
++echo "$as_me:16646: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16308,51 +16659,55 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:16662: 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:16316: checking c++ library-dependency suffix" >&5
++echo "$as_me:16667: 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
+ else
+ 
+-	case normal in
+-	libtool)
++	case normal in #(vi
++	libtool) #(vi
+ 		CXX_LIB_SUFFIX='.la'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	normal)
++	normal) #(vi
+ 		CXX_LIB_SUFFIX='.a'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	debug)
++	debug) #(vi
+ 		CXX_LIB_SUFFIX='_g.a'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	profile)
++	profile) #(vi
+ 		CXX_LIB_SUFFIX='_p.a'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			CXX_LIB_SUFFIX='.a'
++			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
++			;;
++		cygwin*) #(vi
+ 			CXX_LIB_SUFFIX='.dll'
+ 			CXX_DEP_SUFFIX='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			CXX_LIB_SUFFIX='.dylib'
+ 			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				CXX_LIB_SUFFIX='.so'
+ 				CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 				;;
+-			*)
++			*) #(vi
+ 				CXX_LIB_SUFFIX='.sl'
+ 				CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 				;;
+@@ -16366,7 +16721,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:16369: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:16724: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -16480,7 +16835,7 @@
+ 
+ if test "$GCC" = yes ; then
+ 	case $cf_cv_system_name in #(
+-	OS/2*|os2*|aix[45]*) 	#( vi
++	OS/2*|os2*|aix[4]*) 	#( vi
+ 		LDFLAGS_STATIC=
+ 		LDFLAGS_SHARED=
+ 		;;
+@@ -16491,7 +16846,7 @@
+     esac
+ else
+ 	case $cf_cv_system_name in #(
+-	aix[45]*) 	#( from ld manpage
++	aix[456]*) 	#( from ld manpage
+ 		LDFLAGS_STATIC=-bstatic
+ 		LDFLAGS_SHARED=-bdynamic
+ 		;;
+@@ -16519,12 +16874,12 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16522: checking where we will install curses.h" >&5
++echo "$as_me:16877: 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:16527: result: $includedir" >&5
++echo "$as_me:16882: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -16532,10 +16887,11 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:16890: 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
++WITH_OVERWRITE=$with_overwrite
+ 
+ # used to separate tack out of the tree
+ NCURSES_TREE=
+@@ -16548,7 +16904,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:16551: checking for src modules" >&5
++echo "$as_me:16907: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -16611,13 +16967,17 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:16614: result: $cf_cv_src_modules" >&5
++echo "$as_me:16970: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ TEST_ARG2="-L${LIB_2ND} $TEST_ARG2"
+ 
+-SRC_SUBDIRS="man include"
++SRC_SUBDIRS=
++if test "x$cf_with_manpages" != xno ; then
++	SRC_SUBDIRS="$SRC_SUBDIRS man"
++fi
++SRC_SUBDIRS="$SRC_SUBDIRS include"
+ for cf_dir in $cf_cv_src_modules
+ do
+ 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
+@@ -16628,8 +16988,8 @@
+ 
+ ADA_SUBDIRS=
+ if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
+-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
+-   ADA_SUBDIRS="gen src samples"
++	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
++	ADA_SUBDIRS="gen src samples"
+ fi
+ 
+ SUB_MAKEFILES=
+@@ -16639,15 +16999,15 @@
+ done
+ 
+ if test -n "$ADA_SUBDIRS"; then
+-   for cf_dir in $ADA_SUBDIRS
+-   do
+-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
+-   done
++	for cf_dir in $ADA_SUBDIRS
++	do
++		SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
++	done
+ 
+ fi
+ 
+ if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+-   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
++   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
+ fi
+ 
+ DIRS_TO_MAKE="lib"
+@@ -16760,18 +17120,18 @@
+ ### 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:16763: checking for updated LDFLAGS" >&5
++echo "$as_me:17123: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LDFLAGS" ; then
+-echo "$as_me:16766: result: maybe" >&5
++echo "$as_me:17126: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17130: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17134: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ case "$EXTRA_LDFLAGS" in #(vi
+ -Wl,-rpath,*) #(vi
+@@ -16793,7 +17153,7 @@
+ 	do
+ 		test -n "$verbose" && echo "	Filtering $cf_rpath_src" 1>&6
+ 
+-echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
++echo "${as_me-configure}:17156: testing Filtering $cf_rpath_src ..." 1>&5
+ 
+ 		case $cf_rpath_src in #(vi
+ 		-L*) #(vi
+@@ -16804,7 +17164,7 @@
+ 			fi
+ 			test -n "$verbose" && echo "	...Filter $cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
++echo "${as_me-configure}:17167: testing ...Filter $cf_rpath_tmp ..." 1>&5
+ 
+ 			EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			;;
+@@ -16814,15 +17174,15 @@
+ 	LDFLAGS=$cf_rpath_dst
+ 	test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ fi
+ else
+-echo "$as_me:16825: result: no" >&5
++echo "$as_me:17185: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16849,8 +17209,18 @@
+ fi
+ 
+ ################################################################################
+-test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++test "$use_database" = yes && \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
++
++if test x"$enable_pc_files" = xyes ; then \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
++MAKE_PC_FILES=
++else
++MAKE_PC_FILES="#"
++fi
++
+ ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile"
+ ac_config_commands="$ac_config_commands default"
+ cat >confcache <<\_ACEOF
+@@ -16932,7 +17302,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:17305: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -17064,7 +17434,7 @@
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20080325,
++configured by $0, generated by GNU Autoconf 2.52.20081225,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -17108,7 +17478,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:17111: error: ambiguous option: $1
++    { { echo "$as_me:17481: 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;}
+@@ -17127,7 +17497,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:17130: error: unrecognized option: $1
++  -*) { { echo "$as_me:17500: 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;}
+@@ -17146,7 +17516,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20080325, executed with
++This file was extended by $as_me 2.52.20081225, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -17181,13 +17551,13 @@
+ NCURSES_PATCH="$NCURSES_PATCH"
+ SRC_SUBDIRS="$SRC_SUBDIRS"
+ TERMINFO="$TERMINFO"
++TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
++TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
++TICS_NAME="$TICS_NAME"
+ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
+ TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
+ TINFO_NAME="$TINFO_NAME"
+ TINFO_SUFFIX="$TINFO_SUFFIX"
+-TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+-TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
+-TICS_NAME="$TICS_NAME"
+ WITH_CURSES_H="$with_curses_h"
+ WITH_ECHO="$with_echo"
+ WITH_OVERWRITE="$with_overwrite"
+@@ -17206,6 +17576,7 @@
+ cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
+ cf_cv_system_name="$cf_cv_system_name"
+ cf_with_cxx_binding="$cf_with_cxx_binding"
++cf_with_manpages="$cf_with_manpages"
+ host="$host"
+ target="$target"
+ 
+@@ -17224,7 +17595,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:17227: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:17598: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -17349,6 +17720,8 @@
+ s,@LINT@,$LINT,;t t
+ s,@LINT_OPTS@,$LINT_OPTS,;t t
+ s,@LN_S@,$LN_S,;t t
++s,@PKG_CONFIG@,$PKG_CONFIG,;t t
++s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
+ s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
+@@ -17359,7 +17732,7 @@
+ s,@ac_ct_LD@,$ac_ct_LD,;t t
+ s,@AR@,$AR,;t t
+ s,@ac_ct_AR@,$ac_ct_AR,;t t
+-s,@AR_OPTS@,$AR_OPTS,;t t
++s,@ARFLAGS@,$ARFLAGS,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
+ s,@BUILD_CC@,$BUILD_CC,;t t
+ s,@BUILD_CPP@,$BUILD_CPP,;t t
+@@ -17392,6 +17765,7 @@
+ s,@CXX_G_OPT@,$CXX_G_OPT,;t t
+ s,@LD_MODEL@,$LD_MODEL,;t t
+ s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
++s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t
+ s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t
+ s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
+ s,@LINK_PROGS@,$LINK_PROGS,;t t
+@@ -17425,6 +17799,7 @@
+ s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;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
+ s,@NCURSES_CONST@,$NCURSES_CONST,;t t
+ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
+ s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
+@@ -17449,7 +17824,7 @@
+ s,@CXXCPP@,$CXXCPP,;t t
+ s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
+ s,@CXX_AR@,$CXX_AR,;t t
+-s,@CXX_AR_OPTS@,$CXX_AR_OPTS,;t t
++s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t
+ s,@CXXLIBS@,$CXXLIBS,;t t
+ s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
+ s,@gnat_exists@,$gnat_exists,;t t
+@@ -17493,6 +17868,7 @@
+ s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
+ s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
+ s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
++s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
+ CEOF
+ 
+ EOF
+@@ -17607,7 +17983,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:17610: creating $ac_file" >&5
++    { echo "$as_me:17986: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -17625,7 +18001,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18004: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17638,7 +18014,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18017: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17704,7 +18080,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:18083: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -17715,7 +18091,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18094: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17728,7 +18104,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18107: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17786,7 +18162,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:17789: $ac_file is unchanged" >&5
++      { echo "$as_me:18165: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -17873,40 +18249,44 @@
+ 		for cf_item in $cf_LIST_MODELS
+ 		do
+ 
+-	case $cf_item in
+-	libtool)
++	case $cf_item in #(vi
++	libtool) #(vi
+ 		cf_suffix='.la'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	normal)
++	normal) #(vi
+ 		cf_suffix='.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	debug)
++	debug) #(vi
+ 		cf_suffix='_g.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	profile)
++	profile) #(vi
+ 		cf_suffix='_p.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			cf_suffix='.a'
++			cf_depsuf=$cf_suffix
++			;;
++		cygwin*) #(vi
+ 			cf_suffix='.dll'
+ 			cf_depsuf='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			cf_suffix='.dylib'
+ 			cf_depsuf=$cf_suffix
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				cf_suffix='.so'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+-			*)
++			*) #(vi
+ 				cf_suffix='.sl'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+@@ -18020,40 +18400,44 @@
+ 
+ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	case $cf_item in
+-	libtool)
++	case $cf_item in #(vi
++	libtool) #(vi
+ 		cf_suffix='.la'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	normal)
++	normal) #(vi
+ 		cf_suffix='.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	debug)
++	debug) #(vi
+ 		cf_suffix='_g.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	profile)
++	profile) #(vi
+ 		cf_suffix='_p.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			cf_suffix='.a'
++			cf_depsuf=$cf_suffix
++			;;
++		cygwin*) #(vi
+ 			cf_suffix='.dll'
+ 			cf_depsuf='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			cf_suffix='.dylib'
+ 			cf_depsuf=$cf_suffix
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				cf_suffix='.so'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+-			*)
++			*) #(vi
+ 				cf_suffix='.sl'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+@@ -18234,18 +18618,28 @@
+ install.libs uninstall.libs \\
+ install.data uninstall.data ::
+ $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \$@
++CF_EOF
++
++if test "x$cf_with_manpages" = xyes; then
++cat >> Makefile <<CF_EOF
+ 
+ install.man \\
+ uninstall.man ::
+ 	cd man && \${MAKE} \${CF_MFLAGS} \$@
++CF_EOF
++fi
++
++cat >> Makefile <<CF_EOF
+ 
+ distclean ::
+ 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
+ 	rm -f headers.sh headers.sed mk_shared_lib.sh
++	rm -f edit_man.* man_alias.*
+ 	rm -rf \${DIRS_TO_MAKE}
+ CF_EOF
+ 
+ # Special case: tack's manpage lives in its own directory.
++if test "x$cf_with_manpages" = xyes; then
+ if test -d tack ; then
+ if test -f $srcdir/$tack.h; then
+ cat >> Makefile <<CF_EOF
+@@ -18256,6 +18650,7 @@
+ CF_EOF
+ fi
+ fi
++fi
+ 
+ rm -f headers.sed headers.sh
+ 
+diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
+--- ncurses-5.7.orig/configure.in	2008-10-18 07:53:32.000000000 -0700
++++ ncurses-5.7/configure.in	2009-01-27 16:45:02.344642827 -0800
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++dnl Copyright (c) 1998-2008,2009 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.454 2008/10/18 14:53:32 tom Exp $
++dnl $Id: configure.in,v 1.464 2009/01/10 19:18:03 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.454 $)
++AC_REVISION($Revision: 1.464 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -122,6 +122,13 @@
+ 	[cf_with_ada=yes])
+ AC_MSG_RESULT($cf_with_ada)
+ 
++AC_MSG_CHECKING(if you want to install manpages)
++AC_ARG_WITH(manpages,
++	[  --without-manpages      suppress install of manpages],
++	[cf_with_manpages=$withval],
++	[cf_with_manpages=yes])
++AC_MSG_RESULT($cf_with_manpages)
++
+ AC_MSG_CHECKING(if you want to build programs such as tic)
+ AC_ARG_WITH(progs,
+ 	[  --without-progs         suppress build with programs (e.g., tic)],
+@@ -152,6 +159,31 @@
+ 
+ AC_SYS_LONG_FILE_NAMES
+ 
++# 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
++
++	if 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)
++
+ AC_MSG_CHECKING(if we should assume mixed-case filenames)
+ AC_ARG_ENABLE(mixed-case,
+ 	[  --enable-mixed-case     tic should assume mixed-case filenames],
+@@ -176,7 +208,7 @@
+ AC_CHECK_TOOL(RANLIB, ranlib, ':')
+ AC_CHECK_TOOL(LD, ld, ld)
+ AC_CHECK_TOOL(AR, ar, ar)
+-CF_SUBST(archiver options,AR_OPTS,rv)
++CF_AR_FLAGS
+ 
+ dnl Special option for use by system-builders: the install-prefix is used to
+ dnl adjust the location into which the actual install is done, so that an
+@@ -807,7 +839,7 @@
+ test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS)
+ 
+ ###############################################################################
+-CF_MAN_PAGES([ captoinfo clear infocmp infotocap tic toe tput ])
++CF_MAN_PAGES([ captoinfo clear infocmp infotocap tabs tic toe tput tset ])
+ 
+ ###############################################################################
+ CF_HELP_MESSAGE(Extensions:)
+@@ -828,10 +860,13 @@
+ 	AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
+ 	AC_DEFINE(HAVE_WRESIZE)
+ 	AC_DEFINE(NCURSES_EXT_FUNCS)
++	GENERATED_EXT_FUNCS=generated
+ else
+ 	NCURSES_EXT_FUNCS=0
++	GENERATED_EXT_FUNCS=
+ fi
+ AC_SUBST(NCURSES_EXT_FUNCS)
++AC_SUBST(GENERATED_EXT_FUNCS)
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+ AC_MSG_CHECKING(for extended use of const keyword)
+@@ -1354,12 +1389,12 @@
+ 	CF_CPP_STATIC_CAST
+ 
+ 	CXX_AR='$(AR)'
+-	CXX_AR_OPTS='$(AR_OPTS)'
++	CXX_ARFLAGS='$(ARFLAGS)'
+ 	case $cf_cv_system_name in #(vi
+ 	irix*) #(vi
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-ar -o'
++		CXX_ARFLAGS='-ar -o'
+ 	    fi
+ 	    ;;
+ 	sco3.2v5*) #(vi
+@@ -1368,13 +1403,13 @@
+ 	solaris2*)
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-xar -o'
++		CXX_ARFLAGS='-xar -o'
+ 	    fi
+ 	    ;;
+ 	esac
+ 	AC_SUBST(CXXLDFLAGS)
+ 	AC_SUBST(CXX_AR)
+-	AC_SUBST(CXX_AR_OPTS)
++	AC_SUBST(CXX_ARFLAGS)
+ else
+ 	cf_cxx_library=no
+ 	cf_cv_builtin_bool=1
+@@ -1723,6 +1758,7 @@
+ 	AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
+ fi
+ fi
++WITH_OVERWRITE=$with_overwrite
+ 
+ AC_SUBST(WITH_OVERWRITE)
+ AC_SUBST(TICS_LIST)
+@@ -1742,7 +1778,7 @@
+ CF_SRC_MODULES($modules_to_build)
+ 
+ if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+-   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
++   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
+ fi
+ 
+ CF_DIRS_TO_MAKE
+@@ -1765,8 +1801,19 @@
+ CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
+ 
+ ################################################################################
+-test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++test "$use_database" = yes && \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
++
++if test x"$enable_pc_files" = xyes ; then \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
++MAKE_PC_FILES=
++else
++MAKE_PC_FILES="#"
++fi
++AC_SUBST(MAKE_PC_FILES)
++
+ AC_OUTPUT( \
+ 	include/MKterm.h.awk \
+ 	include/curses.head:include/curses.h.in \
+@@ -1796,13 +1843,13 @@
+ NCURSES_PATCH="$NCURSES_PATCH"
+ SRC_SUBDIRS="$SRC_SUBDIRS"
+ TERMINFO="$TERMINFO"
++TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
++TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
++TICS_NAME="$TICS_NAME"
+ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
+ TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
+ TINFO_NAME="$TINFO_NAME"
+ TINFO_SUFFIX="$TINFO_SUFFIX"
+-TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+-TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
+-TICS_NAME="$TICS_NAME"
+ WITH_CURSES_H="$with_curses_h"
+ WITH_ECHO="$with_echo"
+ WITH_OVERWRITE="$with_overwrite"
+@@ -1821,6 +1868,7 @@
+ cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
+ cf_cv_system_name="$cf_cv_system_name"
+ cf_with_cxx_binding="$cf_with_cxx_binding"
++cf_with_manpages="$cf_with_manpages"
+ host="$host"
+ target="$target"
+ 
+diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
+--- ncurses-5.7.orig/dist.mk	2008-11-01 17:58:38.000000000 -0700
++++ ncurses-5.7/dist.mk	2009-01-27 16:45:05.084820505 -0800
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
++# $Id: dist.mk,v 1.684 2009/01/24 20:49:01 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 = 7
+-NCURSES_PATCH = 20081102
++NCURSES_PATCH = 20090124
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
+--- ncurses-5.7.orig/form/frm_driver.c	2008-10-18 09:25:00.000000000 -0700
++++ ncurses-5.7/form/frm_driver.c	2009-01-27 16:44:49.391812822 -0800
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_driver.c,v 1.88 2008/10/18 16:25:00 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.89 2008/12/06 23:08:12 tom Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   This is the core module of the form library. It contains the majority
+@@ -4366,6 +4366,7 @@
+       delwin(field->working);
+       field->working = newpad(field->drows, field->dcols);
+     }
++  len = Buffer_Length(field);
+   wclear(field->working);
+   mvwaddstr(field->working, 0, 0, value);
+ 
+diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
+--- ncurses-5.7.orig/form/Makefile.in	2007-04-28 07:56:11.000000000 -0700
++++ ncurses-5.7/form/Makefile.in	2009-01-27 16:44:58.024366252 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
++# $Id: Makefile.in,v 1.48 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free 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"), #
+@@ -70,7 +70,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
+--- ncurses-5.7.orig/include/curses.h.in	2008-08-30 13:11:29.000000000 -0700
++++ ncurses-5.7/include/curses.h.in	2009-01-27 16:44:52.892037156 -0800
+@@ -32,7 +32,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
++/* $Id: curses.h.in,v 1.190 2008/12/20 22:28:52 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -40,12 +40,6 @@
+ #define CURSES 1
+ #define CURSES_H 1
+ 
+-/* This should be defined for the enhanced functionality to be visible.
+- * However, some of the wide-character (enhanced) functionality is missing.
+- * So we do not define it (yet).
+-#define _XOPEN_CURSES 1
+- */
+-
+ /* These are defined only in curses.h, and are used for conditional compiles */
+ #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
+ #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
+@@ -856,18 +850,18 @@
+  * These extensions provide access to information stored in the WINDOW even
+  * when NCURSES_OPAQUE is set:
+  */
+-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
++extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
+ 
+ #else
+ #define curses_version() NCURSES_VERSION
+diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
+--- ncurses-5.7.orig/include/curses.tail	2008-07-05 13:20:38.000000000 -0700
++++ ncurses-5.7/include/curses.tail	2009-01-27 16:44:46.511630953 -0800
+@@ -1,4 +1,4 @@
+-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
++/* $Id: curses.tail,v 1.17 2008/11/23 00:12:12 tom Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+@@ -94,6 +94,7 @@
+ }
+ MEVENT;
+ 
++extern NCURSES_EXPORT(bool) has_mouse (void);
+ extern NCURSES_EXPORT(int) getmouse (MEVENT *);
+ extern NCURSES_EXPORT(int) ungetmouse (MEVENT *);
+ extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
+diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
+--- ncurses-5.7.orig/include/curses.wide	2007-03-10 09:52:23.000000000 -0800
++++ ncurses-5.7/include/curses.wide	2009-01-27 16:44:48.051726777 -0800
+@@ -1,9 +1,11 @@
+-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
++/* $Id: curses.wide,v 1.36 2008/11/29 18:44:08 tom Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+  * (see that file for the relevant copyright).
+  */
++#define _XOPEN_CURSES 1
++
+ #ifdef _XOPEN_SOURCE_EXTENDED
+ 
+ extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
+diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
+--- ncurses-5.7.orig/INSTALL	2008-11-02 13:13:51.000000000 -0800
++++ ncurses-5.7/INSTALL	2009-01-27 16:44:58.000364576 -0800
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2008,2009 Free 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.135 2008/11/02 21:13:51 tom Exp $
++-- $Id: INSTALL,v 1.137 2009/01/03 23:59:23 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -525,6 +525,11 @@
+ 	terminfo entries.  This is the default, unless you have disabled the
+ 	extended functions.
+ 
++    --enable-pc-files
++	If pkg-config is found (see --with-pkg-config), generate ".pc" files
++	for each of the libraries, and install them in pkg-config's library
++	directory.
++
+     --enable-reentrant
+ 	Compile experimental configuration which improves reentrant use of the
+ 	library by reducing global and static variables.  This option is also
+@@ -850,6 +855,9 @@
+ 	those using termcap, do not use the higher speeds.  Your application
+ 	(or system, in general) may or may not.
+ 
++    --with-pkg-config=[DIR]
++	Check for pkg-config, optionally specifying its path.
++
+     --with-profile
+ 	Generate profile-libraries These are named by adding "_p" to the root,
+ 	e.g., libncurses_p.a
+@@ -975,6 +983,9 @@
+     --without-dlsym
+ 	Do not use dlsym() to load GPM dynamically.
+ 
++    --without-manpages
++	Tell the configure script to suppress the install of ncurses' manpages.
++
+     --without-progs
+ 	Tell the configure script to suppress the build of ncurses' application
+ 	programs (e.g., tic).  The test applications will still be built if you
+diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x
+--- ncurses-5.7.orig/man/curs_color.3x	2005-12-17 16:00:37.000000000 -0800
++++ ncurses-5.7/man/curs_color.3x	2009-01-27 16:45:05.084820505 -0800
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2005,2009 Free 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_color.3x,v 1.28 2005/12/18 00:00:37 tom Exp $
++.\" $Id: curs_color.3x,v 1.29 2009/01/24 23:10:02 tom Exp $
+ .TH curs_color 3X ""
+ .na
+ .hy 0
+@@ -96,7 +96,10 @@
+ .TP 5
+ -
+ The value of the first argument
+-must be between \fB1\fR and \fBCOLOR_PAIRS-1\fR.
++must be between \fB1\fR and \fBCOLOR_PAIRS-1\fR,
++except that if default colors are used (see \fBuse_default_colors\fP)
++the upper limit is adjusted to allow for extra pairs which use
++a default color in foreground and/or background.
+ .TP 5
+ -
+ The value of the second and
+diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
+--- ncurses-5.7.orig/man/curs_mouse.3x	2006-12-30 15:43:34.000000000 -0800
++++ ncurses-5.7/man/curs_mouse.3x	2009-01-27 16:44:46.515630395 -0800
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2006,2008 Free 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,11 +27,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.31 2008/11/23 00:09:53 tom Exp $
+ .TH curs_mouse 3X ""
+ .na
+ .hy 0
+ .SH NAME
++\fBhas_mouse\fR,
+ \fBgetmouse\fR, \fBungetmouse\fR,
+ \fBmousemask\fR, \fBwenclose\fR,
+ \fBmouse_trafo\fR, \fBwmouse_trafo\fR,
+@@ -53,7 +54,9 @@
+ MEVENT;\fR
+ .fi
+ .br
+-\fBint getmouse(MEVENT *event);\fR
++\fBbool has_mouse(void);\fR
++.br
++-\fBint getmouse(MEVENT *event);\fR
+ .br
+ \fBint ungetmouse(MEVENT *event);\fR
+ .br
+@@ -197,6 +200,9 @@
+ Use \fBmouseinterval(-1)\fR to obtain the interval without altering it.
+ The default is one sixth of a second.
+ .PP
++The \fBhas_mouse\fP function returns TRUE if the mouse driver has been
++successfully initialized.
++.PP
+ Note that mouse events will be ignored when input is in cooked mode, and will
+ cause an error beep when cooked mode is being simulated in a window by a
+ function such as \fBgetstr\fR that expects a linefeed for input-loop
+diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
+--- ncurses-5.7.orig/man/keybound.3x	2006-02-25 13:47:06.000000000 -0800
++++ ncurses-5.7/man/keybound.3x	2009-01-27 16:44:51.023917306 -0800
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1999-2003,2006 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1999-2006,2008 Free 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,8 +28,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.6 2006/02/25 21:47:06 tom Exp $
+-.TH keyok 3X ""
++.\" $Id: keybound.3x,v 1.7 2008/12/13 18:19:07 Frederic.Culot Exp $
++.TH keybound 3X ""
+ .SH NAME
+ \fBkeybound\fP \- return definition of keycode
+ .SH SYNOPSIS
+diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
+--- ncurses-5.7.orig/man/tabs.1	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/man/tabs.1	2009-01-27 16:44:45.091537644 -0800
+@@ -0,0 +1,143 @@
++.\"***************************************************************************
++.\" Copyright (c) 2008 Free 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: tabs.1,v 1.2 2008/11/15 23:03:45 tom Exp $
++.TH @TABS@ 1M ""
++.ds n 5
++.SH NAME
++\fBtabs\fR - set tabs on a terminal
++.SH SYNOPSIS
++\fBtabs\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.
++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.
++The terminal should be configured to use hard tabs, e.g.,
++.sp
++.RS
++stty tab0
++.RE
++.SH OPTIONS
++.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
++environment variable.
++If that is not set, it will use the \fIansi+tabs\fP entry.
++.TP 5
++.B -d
++The debugging option shows a ruler line, followed by two data lines.
++The first data line shows the expected tab-stops marked with asterisks.
++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
++option, but not to modify the terminal settings.
++.PP
++The \fBtabs\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
++Use a single number as an option, e.g., "\fB-5\fP" to set tabs at the given
++interval (in this case 1, 6, 11, 16, 21, etc.).  Tabs are repeated up to
++the right margin of the screen.
++.SS Explicit Lists
++An explicit list can be defined after the options (this does not use a "-").
++The values in the list must be in increasing numeric order, and greater than
++zero.  They are separated by a comma or a blank, for example,
++.sp
++.RS
++tabs 1,6,11,16,21
++.br
++tabs 1 6 11 16 21
++.RE
++Use a '+' to treat a number as an increment relative to the previous value,
++e.g.,
++.sp
++.RS
++tabs 1,+5,+5,+5,+5
++.RE
++which is equivalent to the 1,6,11,16,21 example.
++.SS Predefined Tab-Stops
++X/Open defines several predefined lists of tab stops.
++.TP 5
++.B -a
++Assembler, IBM S/370, first format
++.TP 5
++.B -a2
++Assembler, IBM S/370, second format
++.TP 5
++.B -c
++COBOL, normal format
++.TP 5
++.B -c2
++COBOL compact format
++.TP 5
++.B -c3
++COBOL compact format extended
++.TP 5
++.B -f
++FORTRAN
++.TP 5
++.B -p
++PL/I
++.TP 5
++.B -s
++SNOBOL
++.TP 5
++.B -u
++UNIVAC 1100 Assembler
++.SH PORTABILITY
++.PP
++X/Open describes a \fB+m\fP option, to set a terminal's left-margin.
++None of the entries in the terminal database provide this capability.
++.PP
++The \fB-d\fP (debug) and \fB-n\fP (no-op) options are extensions not provided
++by other implementations.
++.PP
++Documentation for other implementations states that there is a limit on the
++number of tab stops.  While some terminals may not accept an arbitrary number
++of tab stops, this implementation will attempt to set tab stops up to the
++right margin of the screen, if the given list happens to be that long.
++.SH SEE ALSO
++\fB@TSET@\fR(1),
++\fB@INFOCMP@\fR(1M),
++\fBcurses\fR(3X),
++\fBterminfo\fR(\*n).
++.PP
++This describes \fBncurses\fR
++version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
++.\"#
++.\"# The following sets edit modes for GNU EMACS
++.\"# Local Variables:
++.\"# mode:nroff
++.\"# fill-column:79
++.\"# End:
+diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
+--- ncurses-5.7.orig/man/tset.1	2006-12-24 07:00:30.000000000 -0800
++++ ncurses-5.7/man/tset.1	2009-01-27 16:44:45.091537644 -0800
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2006,2008 Free 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,8 +26,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp $
+-.TH tset 1 ""
++.\" $Id: tset.1,v 1.20 2008/11/15 23:14:06 tom Exp $
++.TH @TSET@ 1 ""
+ .SH NAME
+ \fBtset\fR, \fBreset\fR - terminal initialization
+ .SH SYNOPSIS
+diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
+--- ncurses-5.7.orig/MANIFEST	2008-10-25 16:47:24.000000000 -0700
++++ ncurses-5.7/MANIFEST	2009-01-27 16:44:58.000364576 -0800
+@@ -640,6 +640,7 @@
+ ./man/ncurses.3x
+ ./man/panel.3x
+ ./man/resizeterm.3x
++./man/tabs.1
+ ./man/term.5
+ ./man/term.7
+ ./man/terminfo.head
+@@ -694,6 +695,7 @@
+ ./misc/emx.src
+ ./misc/form.def
+ ./misc/form.ref
++./misc/gen-pkgconfig.in
+ ./misc/gen_edit.sh
+ ./misc/jpf-indent
+ ./misc/makedef.cmd
+@@ -947,6 +949,7 @@
+ ./progs/infocmp.c
+ ./progs/modules
+ ./progs/progs.priv.h
++./progs/tabs.c
+ ./progs/tic.c
+ ./progs/toe.c
+ ./progs/tput.c
+@@ -963,6 +966,7 @@
+ ./test/cardfile.c
+ ./test/cardfile.dat
+ ./test/chgat.c
++./test/clip_printw.c
+ ./test/color_set.c
+ ./test/configure
+ ./test/configure.in
+@@ -990,6 +994,7 @@
+ ./test/inch_wide.c
+ ./test/inchs.c
+ ./test/ins_wide.c
++./test/insdelln.c
+ ./test/inserts.c
+ ./test/key_names.c
+ ./test/keynames.c
+diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
+--- ncurses-5.7.orig/menu/Makefile.in	2007-04-28 07:56:11.000000000 -0700
++++ ncurses-5.7/menu/Makefile.in	2009-01-27 16:44:58.024366252 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
++# $Id: Makefile.in,v 1.49 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free 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"), #
+@@ -70,7 +70,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
+--- ncurses-5.7.orig/misc/gen-pkgconfig.in	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/misc/gen-pkgconfig.in	2009-01-27 16:45:05.084820505 -0800
+@@ -0,0 +1,119 @@
++#!@SHELL@
++# $Id: gen-pkgconfig.in,v 1.5 2009/01/24 21:06:36 tom Exp $
++##############################################################################
++# Copyright (c) 2009 Free 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, 2009
++#
++# The complete configure script for ncurses is the ncurses5-config (or similar
++# name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc).
++# That provides more information than pkg-config, and is the portable and
++# recommended solution.
++#
++# For each library, generate a ".pc" file which depends on the base ncurses
++# library, except that the tinfo library does not depend on ncurses.
++LIB_NAME=@LIB_NAME@
++TINFO_NAME=@TINFO_NAME@
++DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
++CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
++
++prefix="@prefix@"
++exec_prefix="@exec_prefix@"
++includedir="@includedir@"
++libdir="@libdir@"
++
++show_prefix='@prefix@'
++show_exec_prefix='@exec_prefix@'
++show_includedir='@includedir@'
++show_libdir='@libdir@'
++
++MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
++SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
++
++for lib in ../lib/*
++do
++	name=`basename $lib`
++	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
++
++	name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
++
++	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
++	if test $name = $MAIN_LIBRARY ; then
++		reqs=
++		desc="$desc library"
++	elif test $name = $SUB_LIBRARY ; then
++		reqs=
++		desc="$desc terminal interface library"
++	else
++		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@"
++	fi
++
++	echo "** creating ${name}.pc"
++	cat >${name}.pc <<EOF
++prefix=$show_prefix
++exec_prefix=$show_exec_prefix
++libdir=$show_libdir
++includedir=$show_includedir
++major_version=@NCURSES_MAJOR@
++version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
++
++Name: $name
++Description: $desc
++Version: \${version}
++Requires: $reqs
++Libs: $libs
++Cflags: $cflags
++EOF
++	# pr -f ${name}.pc
++done
++# vile:shmode
+diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
+--- ncurses-5.7.orig/misc/Makefile.in	2007-03-31 08:54:17.000000000 -0700
++++ ncurses-5.7/misc/Makefile.in	2009-01-27 16:45:05.084820505 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
++# $Id: Makefile.in,v 1.50 2009/01/24 21:42:15 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 Free 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"), #
+@@ -66,15 +66,17 @@
+ source		= @TERMINFO_SRC@
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROG	= @INSTALL_PROGRAM@
++INSTALL_PROG	= @INSTALL_SCRIPT@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++
+ ################################################################################
+ all :	terminfo.tmp
+ 
+ depend :
+ 
+-sources :
++sources :: terminfo.tmp 
+ 
+ install : install.data install.libs
+ 
+@@ -103,9 +105,17 @@
+ 
+ NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
+ 
+-install.libs : $(DESTDIR)$(bindir) ncurses-config
++install.libs :: $(DESTDIR)$(bindir) ncurses-config
+ 	$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+ 
++@MAKE_PC_FILES@install.libs :: pc-files
++@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done'
++
++@MAKE_PC_FILES@sources :: pc-files
++@MAKE_PC_FILES@pc-files :
++@MAKE_PC_FILES@	$(SHELL) ./gen-pkgconfig
++@MAKE_PC_FILES@	touch $@
++
+ terminfo.tmp : run_tic.sed $(source)
+ 	echo '** adjusting tabset paths'
+ 	sed -f run_tic.sed $(source) >terminfo.tmp
+@@ -130,6 +140,7 @@
+ 
+ uninstall.libs :
+ 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
++@MAKE_PC_FILES@	$(SHELL) 'for name in *.pc; do rm -f $(PKG_CONFIG_LIBDIR)/$$name; done'
+ 
+ tags :
+ 
+@@ -138,11 +149,13 @@
+ mostlyclean :
+ 	-rm -f terminfo.tmp
+ 	-rm -f run_tic.sed
++@MAKE_PC_FILES@	-rm -f *.pc pc-files
+ 	-rm -f core tags TAGS *~ *.bak *.ln *.atac trace
+ 
+ clean :: mostlyclean
+ 
+ distclean : clean
++@MAKE_PC_FILES@	-rm -f gen-pkgconfig
+ 	-rm -f Makefile run_tic.sh ncurses-config
+ 
+ realclean : distclean
+diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
+--- ncurses-5.7.orig/misc/ncurses-config.in	2007-03-17 13:02:19.000000000 -0700
++++ ncurses-5.7/misc/ncurses-config.in	2009-01-27 16:45:05.084820505 -0800
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
++# $Id: ncurses-config.in,v 1.22 2009/01/24 21:06:45 tom Exp $
+ ##############################################################################
+-# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
++# Copyright (c) 2006-2007,2009 Free 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,58 +28,54 @@
+ # authorization.                                                             #
+ ##############################################################################
+ #
+-# Author: Thomas E. Dickey, 2006
++# Author: Thomas E. Dickey, 2006-on
+ 
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
++includedir="@includedir@"
+ libdir="@libdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+ 
+-THIS="ncurses@DFT_ARG_SUFFIX@"
++THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
+ 
+ LANG=C;		export LANG
+ LANGUAGE=C;	export LANGUAGE
+ LC_ALL=C;	export LC_ALL
+ LC_CTYPE=C;	export LC_CTYPE
+ 
+-test $# = 0 && exec @SHELL@ $0 --error
+-
+-while test $# -gt 0; do
+-	case "$1" in
+-	-*=*)
+-		ARG=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+-		;;
+-	*)
+-		ARG=
++# with --disable-overwrite, we installed into a subdirectory, but transformed
++# the headers to include like this:
++#	<ncurses@LIB_SUFFIX@/curses.h>
++if test x@WITH_OVERWRITE@ = xno ; then
++	case $includedir in
++	$prefix/include/ncurses@LIB_SUFFIX@)
++		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
+ 		;;
+ 	esac
++fi
+ 
++test $# = 0 && exec @SHELL@ $0 --error
++
++while test $# -gt 0; do
+ 	case "$1" in
+ 	# basic configuration
+-	--prefix=*)
+-		prefix="$ARG"
+-		test -z "$exec_prefix" && exec_prefix="$ARG"
+-		;;
+ 	--prefix)
+ 		echo "$prefix"
+ 		;;
+-	--exec-prefix=*)
+-		exec_prefix="$ARG"
+-		;;
+ 	--exec-prefix)
+ 		echo "$exec_prefix"
+ 		;;
+ 	# compile/link
+ 	--cflags)
+ 		INCS=
+-		if test "${prefix}/include" != /usr/include ; then
+-			INCS="-I${prefix}/include"
++		if test "${includedir}" != /usr/include ; then
++			INCS="-I${includedir}"
+ 		fi
+-		if test "@WITH_OVERWRITE@" != no ; then
+-			INCS="$INCS -I${prefix}/include/${THIS}"
++		if test "x@WITH_OVERWRITE@" = xno ; then
++			INCS="$INCS -I${includedir}/${THIS}"
+ 		fi
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+ 			$INCS
+@@ -87,7 +83,7 @@
+ 		;;
+ 	--libs)
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+-			-L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
++			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+ ENDECHO
+ 		;;
+ 	# identification
+@@ -107,6 +103,9 @@
+ 	--datadir)
+ 		echo "${datadir}"
+ 		;;
++	--includedir)
++		echo "${includedir}"
++		;;
+ 	--libdir)
+ 		echo "${libdir}"
+ 		;;
+@@ -129,9 +128,7 @@
+ 
+ Options:
+   --prefix           echos the package-prefix of ${THIS}
+-  --prefix=ARG       sets the package-prefix of ${THIS}
+   --exec-prefix      echos the executable-prefix of ${THIS}
+-  --exec-prefix=ARG  sets the executable-prefix of ${THIS}
+ 
+   --cflags           echos the C compiler flags needed to compile with ${THIS}
+   --libs             echos the libraries needed to link with ${THIS}
+@@ -142,6 +139,7 @@
+ 
+   --bindir           echos the directory containing ${THIS} programs
+   --datadir          echos the directory containing ${THIS} data
++  --includedir       echos the directory containing ${THIS} header files
+   --libdir           echos the directory containing ${THIS} libraries
+   --mandir           echos the directory containing ${THIS} manpages
+   --terminfo         echos the \$TERMINFO terminfo database path
+diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
+--- ncurses-5.7.orig/misc/terminfo.src	2008-10-12 16:03:54.000000000 -0700
++++ ncurses-5.7/misc/terminfo.src	2009-01-27 16:45:02.352643385 -0800
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.341 $
+-#	$Date: 2008/10/12 23:03:54 $
++#	$Revision: 1.345 $
++#	$Date: 2009/01/11 00:47:37 $
+ #
+ # 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
+@@ -340,7 +340,7 @@
+ 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+ 	cuu=\E[%p1%dA, use=ansi+local1,
+ ansi+tabs,
+-	cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[2g,
++	cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[3g,
+ ansi+inittabs,
+ 	it#8, use=ansi+tabs,
+ ansi+erase,
+@@ -545,7 +545,7 @@
+ 	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+ 	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+ 	hts=\EH, il1=\E[L, ind=^J, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[2g,
++	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[3g,
+ 	use=klone+sgr-dumb,
+ pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
+ 	lines#25, use=pcansi-m,
+@@ -576,7 +576,7 @@
+ 	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rin=\E[%p1%dT, s0ds=\E(B,
+-	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[2g,
++	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
+ 	vpa=\E[%i%p1%dd, use=pcansi-m,
+ 
+ ansi+enq|ncurses extension for ANSI ENQ,
+@@ -1005,7 +1005,7 @@
+ 	sc=\E7,
+ 	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
+ 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[2g, vpa=\E[%i%p1%dd, use=klone+color,
++	tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color,
+ # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+ pc6300plus|AT&T 6300 plus,
+ 	OTbs, am, xon,
+@@ -1416,7 +1416,7 @@
+ 	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%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[2g,
++	smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
+ #
+ qansi|QNX ansi with console writes,
+@@ -4357,6 +4357,26 @@
+ 	sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m,
+ 
++# The codes supported by the term.el terminal emulation in GNU Emacs 22.2
++eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
++	am, mir, msgr, xenl,
++	colors#8, cols#80, lines#24, pairs#64,
++	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, 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, ed=\E[J,
++	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@,
++	il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
++	knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m,
++	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
++	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
++	u6=\E[%i%d;%dR, u7=\E[6n,
++
+ # Entries for use by the `screen' program by Juergen Weigert,
+ # Michael Schroeder, Oliver Laumann.  The screen and
+ # screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
+@@ -4497,6 +4517,8 @@
+ 	cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ 	kcuu1=\EOA, use=screen+fkeys, use=vt100+enq,
+ 	use=rxvt+pcfkeys, use=vt220+keypad, use=screen,
++screen.Eterm|screen in Eterm,
++	use=screen+fkeys, use=Eterm,
+ # fix the backspace key
+ screen.linux|screen in linux console,
+ 	bw,
+@@ -5247,7 +5269,7 @@
+ 	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,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[2g, vpa=\E[%i%p1%dd, use=vt102+enq,
++	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
+ 
+ # Key definitions:
+ # The encodings for unshifted arrow keys, F1-F12, Home, Insert, etc.  match the
+@@ -11060,7 +11082,7 @@
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;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[2g,
++	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%p1%{1}%+%dd,
+ 
+ aaa+rv|ann arbor ambassador in reverse video,
+@@ -12147,7 +12169,7 @@
+ 	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[2g, vpa=\E[%p1%{1}%+%dd,
++	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,
+@@ -14584,7 +14606,7 @@
+ 	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%;,
+ 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[2g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
++	tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
+ 
+ # p9-w: Prism-9 in 132 column mode
+ # --------------------------------
+@@ -16037,7 +16059,7 @@
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l,
+ 	rmso=\E[m, rmul=\E[m,
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+-	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[2g,
++	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%p1%{1}%+%dd,
+ # The tek4125 emulates a vt100 incorrectly - the scrolling region
+ # command is ignored.  The following entry replaces <csr> with the needed
+@@ -17729,7 +17751,7 @@
+ 	rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N,
+ 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99\:98\E\\,
+-	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[2g,
++	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
+ 	tsl=\EPY99\:98\E\\\E[0;98v\E[2;7m,
+ tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA,
+ 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
+@@ -21791,6 +21813,16 @@
+ #	* add "aterm" -TD
+ #	* add "linux2.6.26" -TD
+ #
++# 2008-11-15
++#	* change several \E[2g (clear tab at current column) to \E[3g
++#	  (clear all tabs) to match definition for tbc capability -TD
++#
++# 2008-11-29
++#	* add eterm-color -TD
++#
++# 2009-01-10
++#	* add screen.Eterm -TD
++#
+ # The following sets edit modes for GNU EMACS.
+ # Local Variables:
+ # fill-prefix:"\t"
+diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
+--- ncurses-5.7.orig/mk-1st.awk	2007-03-24 15:10:55.000000000 -0700
++++ ncurses-5.7/mk-1st.awk	2009-01-27 16:44:59.364453973 -0800
+@@ -1,6 +1,6 @@
+-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
++# $Id: mk-1st.awk,v 1.80 2009/01/04 21:51:38 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2008 Free 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"), #
+@@ -59,7 +59,7 @@
+ 		return ( subset ~ /^ticlib$/ );
+ 	}
+ function is_termlib() {
+-		return ( subset ~ /^(ticlib\+)?termlib(\+ext_tinfo)?$/ );
++		return ( subset ~ /^(ticlib\+)?termlib((\+[^+ ]+)*\+ext_tinfo)?$/ );
+ 	}
+ # see lib_name
+ function lib_name_of(a_name) {
+@@ -404,7 +404,7 @@
+ 			{
+ 				end_name = lib_name;
+ 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
+-				printf "\t$(AR) $(AR_OPTS) $@ $?\n"
++				printf "\t$(AR) $(ARFLAGS) $@ $?\n"
+ 				printf "\t$(RANLIB) $@\n"
+ 				if ( host == "vxworks" )
+ 				{
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
+--- ncurses-5.7.orig/ncurses/base/lib_addch.c	2008-08-16 12:20:04.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_addch.c	2009-01-27 16:45:03.676729990 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 Free 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.113 2008/08/16 19:20:04 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.115 2009/01/17 20:37:32 tom Exp $")
+ 
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+ 
+@@ -265,15 +265,25 @@
+ 	    int len = _nc_build_wch(win, CHREF(ch));
+ 
+ 	    if (len >= -1) {
+-		/* handle EILSEQ */
++		attr_t attr = AttrOf(ch);
++
++		/* handle EILSEQ (i.e., when len >= -1) */
+ 		if (is8bits(CharOf(ch))) {
++		    int rc = OK;
+ 		    const char *s = unctrl((chtype) CharOf(ch));
+-		    if (s[1] != 0) {
+-			return waddstr(win, s);
++
++		    if (s[1] != '\0') {
++			while (*s != '\0') {
++			    rc = waddch(win, UChar(*s) | attr);
++			    if (rc != OK)
++				break;
++			    ++s;
++			}
++			return rc;
+ 		    }
+ 		}
+ 		if (len == -1)
+-		    return waddch(win, ' ');
++		    return waddch(win, ' ' | attr);
+ 	    } else {
+ 		return OK;
+ 	    }
+@@ -327,6 +337,7 @@
+ 		    return ERR;
+ 		x = win->_curx;
+ 		y = win->_cury;
++		line = win->_line + y;
+ 	    }
+ 	    /*
+ 	     * Check for cells which are orphaned by adding this character, set
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c
+--- ncurses-5.7.orig/ncurses/base/lib_color.c	2007-04-07 10:07:28.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_color.c	2009-01-27 16:45:05.088820784 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2007,2009 Free 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 <term.h>
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.87 2009/01/25 00:25:31 tom Exp $")
+ 
+ /*
+  * These should be screen structure members.  They need to be globals for
+@@ -108,6 +108,13 @@
+ };
+ /* *INDENT-ON* */
+ 
++/*
++ * Ensure that we use color pairs only when colors have been started, and also
++ * that the index is within the limits of the table which we allocated.
++ */
++#define ValidPair(pair) \
++    ((SP != 0) && (pair >= 0) && (pair < SP->_pair_limit) && SP->_coloron)
++
+ #if NCURSES_EXT_FUNCS
+ /*
+  * These are called from _nc_do_color(), which in turn is called from
+@@ -255,6 +262,15 @@
+ 	}
+ 
+ 	if (max_pairs > 0 && max_colors > 0) {
++	    SP->_pair_limit = max_pairs;
++
++#if NCURSES_EXT_FUNCS
++	    /*
++	     * If using default colors, allocate extra space in table to
++	     * allow for default-color as a component of a color-pair.
++	     */
++	    SP->_pair_limit += (1 + (2 * max_colors));
++#endif
+ 	    SP->_pair_count = max_pairs;
+ 	    SP->_color_count = max_colors;
+ #if !USE_REENTRANT
+@@ -263,7 +279,7 @@
+ #endif
+ 
+ 	    if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
+-						max_pairs)) != 0) {
++						SP->_pair_limit)) != 0) {
+ 		if ((SP->_color_table = TYPE_CALLOC(color_t,
+ 						    max_colors)) != 0) {
+ 		    SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg());
+@@ -331,21 +347,69 @@
+ init_pair(short pair, short f, short b)
+ {
+     colorpair_t result;
++    colorpair_t previous;
+ 
+     T((T_CALLED("init_pair(%d,%d,%d)"), pair, f, b));
+ 
+-    if ((pair < 0) || (pair >= COLOR_PAIRS) || SP == 0 || !SP->_coloron)
++    if (!ValidPair(pair))
+ 	returnCode(ERR);
++
++    previous = SP->_color_pairs[pair];
+ #if NCURSES_EXT_FUNCS
+     if (SP->_default_color) {
+-	if (f < 0)
++	bool isDefault = FALSE;
++	bool wasDefault = FALSE;
++	int default_pairs = SP->_default_pairs;
++
++	/*
++	 * Map caller's color number, e.g., -1, 0, 1, .., 7, etc., into
++	 * internal unsigned values which we will store in the _color_pairs[]
++	 * table.
++	 */
++	if (isDefaultColor(f)) {
+ 	    f = COLOR_DEFAULT;
+-	if (b < 0)
++	    isDefault = TRUE;
++	} else if (!OkColorHi(f)) {
++	    returnCode(ERR);
++	}
++
++	if (isDefaultColor(b)) {
+ 	    b = COLOR_DEFAULT;
+-	if (!OkColorHi(f) && !isDefaultColor(f))
++	    isDefault = TRUE;
++	} else if (!OkColorHi(b)) {
+ 	    returnCode(ERR);
+-	if (!OkColorHi(b) && !isDefaultColor(b))
++	}
++
++	/*
++	 * Check if the table entry that we are going to init/update used
++	 * default colors.
++	 */
++	if ((FORE_OF(previous) == COLOR_DEFAULT)
++	    || (BACK_OF(previous) == COLOR_DEFAULT))
++	    wasDefault = TRUE;
++
++	/*
++	 * Keep track of the number of entries in the color pair table which
++	 * used a default color.
++	 */
++	if (isDefault && !wasDefault) {
++	    ++default_pairs;
++	} else if (wasDefault && !isDefault) {
++	    --default_pairs;
++	}
++
++	/*
++	 * As an extension, ncurses allows the pair number to exceed the
++	 * terminal's color_pairs value for pairs using a default color.
++	 *
++	 * Note that updating a pair which used a default color with one
++	 * that does not will decrement the count - and possibly interfere
++	 * with sequentially adding new pairs.
++	 */
++	if (pair > (SP->_pair_count + default_pairs)) {
+ 	    returnCode(ERR);
++	}
++	SP->_default_pairs = default_pairs;
+     } else
+ #endif
+     {
+@@ -361,8 +425,8 @@
+      * pair colors with the new ones).
+      */
+     result = PAIR_OF(f, b);
+-    if (SP->_color_pairs[pair] != 0
+-	&& SP->_color_pairs[pair] != result) {
++    if (previous != 0
++	&& previous != result) {
+ 	int y, x;
+ 
+ 	for (y = 0; y <= curscr->_maxy; y++) {
+@@ -496,11 +560,11 @@
+ 
+     T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b));
+ 
+-    if ((pair < 0) || (pair >= COLOR_PAIRS) || SP == 0 || !SP->_coloron) {
++    if (!ValidPair(pair)) {
+ 	result = ERR;
+     } else {
+-	NCURSES_COLOR_T fg = ((SP->_color_pairs[pair] >> C_SHIFT) & C_MASK);
+-	NCURSES_COLOR_T bg = (SP->_color_pairs[pair] & C_MASK);
++	NCURSES_COLOR_T fg = FORE_OF(SP->_color_pairs[pair]);
++	NCURSES_COLOR_T bg = BACK_OF(SP->_color_pairs[pair]);
+ 
+ #if NCURSES_EXT_FUNCS
+ 	if (fg == COLOR_DEFAULT)
+@@ -527,7 +591,7 @@
+     NCURSES_COLOR_T bg = COLOR_DEFAULT;
+     NCURSES_COLOR_T old_fg, old_bg;
+ 
+-    if (pair < 0 || pair >= COLOR_PAIRS) {
++    if (!ValidPair(pair)) {
+ 	return;
+     } else if (pair != 0) {
+ 	if (set_color_pair) {
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c
+--- ncurses-5.7.orig/ncurses/base/lib_colorset.c	2005-01-29 13:40:51.000000000 -0800
++++ ncurses-5.7/ncurses/base/lib_colorset.c	2009-01-27 16:45:05.088820784 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2009 Free 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: Juergen Pfeifer,  1998                                          *
+- *     and: Thomas E. Dickey, 2005                                          *
++ *     and: Thomas E. Dickey, 2005-on                                       *
+  ****************************************************************************/
+ 
+ /*
+@@ -41,20 +41,23 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: lib_colorset.c,v 1.11 2005/01/29 21:40:51 tom Exp $")
++MODULE_ID("$Id: lib_colorset.c,v 1.12 2009/01/25 00:44:40 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wcolor_set(WINDOW *win, short color_pair_number, void *opts)
+ {
++    int code = ERR;
++
+     T((T_CALLED("wcolor_set(%p,%d)"), win, color_pair_number));
+     if (win
+ 	&& !opts
++	&& (SP != 0)
+ 	&& (color_pair_number >= 0)
+-	&& (color_pair_number < COLOR_PAIRS)) {
++	&& (color_pair_number < SP->_pair_limit)) {
+ 	TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win)));
+ 	SET_WINDOW_PAIR(win, color_pair_number);
+ 	if_EXT_COLORS(win->_color = color_pair_number);
+-	returnCode(OK);
+-    } else
+-	returnCode(ERR);
++	code = OK;
++    }
++    returnCode(code);
+ }
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
+--- ncurses-5.7.orig/ncurses/base/lib_freeall.c	2008-09-27 06:09:57.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_freeall.c	2009-01-27 16:44:49.391812822 -0800
+@@ -40,7 +40,7 @@
+ extern int malloc_errfd;	/* FIXME */
+ #endif
+ 
+-MODULE_ID("$Id: lib_freeall.c,v 1.54 2008/09/27 13:09:57 tom Exp $")
++MODULE_ID("$Id: lib_freeall.c,v 1.55 2008/12/06 23:52:29 tom Exp $")
+ 
+ /*
+  * Free all ncurses data.  This is used for testing only (there's no practical
+@@ -98,8 +98,6 @@
+ 	delscreen(SP);
+ 	_nc_unlock_global(curses);
+     }
+-    if (cur_term != 0)
+-	del_curterm(cur_term);
+ 
+     (void) _nc_printf_string(0, empty_va);
+ #ifdef TRACE
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
+--- ncurses-5.7.orig/ncurses/base/lib_mouse.c	2008-10-18 14:48:55.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_mouse.c	2009-01-27 16:44:49.391812822 -0800
+@@ -79,7 +79,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.104 2008/11/30 01:37:27 tom Exp $")
+ 
+ #include <term.h>
+ #include <tic.h>
+@@ -694,11 +694,16 @@
+ 
+ #if USE_GPM_SUPPORT
+     case M_GPM:
+-	{
++	if (sp->_mouse_fd >= 0) {
+ 	    /* query server for event, return TRUE if we find one */
+ 	    Gpm_Event ev;
+ 
+-	    if (my_Gpm_GetEvent(&ev) == 1) {
++	    switch (my_Gpm_GetEvent(&ev)) {
++	    case 0:
++		/* Connection closed, drop the mouse. */
++		sp->_mouse_fd = -1;
++		break;
++	    case 1:
+ 		/* there's only one mouse... */
+ 		eventp->id = NORMAL_EVENT;
+ 
+@@ -731,6 +736,7 @@
+ 		/* bump the next-free pointer into the circular list */
+ 		sp->_mouse_eventp = eventp = NEXT(eventp);
+ 		result = TRUE;
++		break;
+ 	    }
+ 	}
+ 	break;
+@@ -1397,10 +1403,16 @@
+ 
+ /* This may be used by other routines to ask for the existence of mouse
+    support */
+-NCURSES_EXPORT(int)
+-_nc_has_mouse(void)
++NCURSES_EXPORT(bool)
++_nc_has_mouse(SCREEN *sp)
++{
++    return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE);
++}
++
++NCURSES_EXPORT(bool)
++has_mouse(void)
+ {
+-    return (SP->_mouse_type == M_NONE ? 0 : 1);
++    return _nc_has_mouse(SP);
+ }
+ 
+ NCURSES_EXPORT(bool)
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c
+--- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c	2005-01-28 13:11:53.000000000 -0800
++++ ncurses-5.7/ncurses/base/lib_slkatr_set.c	2009-01-27 16:45:05.088820784 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2009 Free 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:  Juergen Pfeifer, 1998                                          *
+- *     and:  Thomas E. Dickey 2005                                          *
++ *     and:  Thomas E. Dickey 2005-on                                       *
+  ****************************************************************************/
+ 
+ /*
+@@ -38,22 +38,27 @@
+  */
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $")
++MODULE_ID("$Id: lib_slkatr_set.c,v 1.11 2009/01/25 00:47:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
+ {
++    int code = ERR;
++
+     T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
+ 
+-    if (SP != 0 && SP->_slk != 0 && !opts &&
+-	color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
++    if (SP != 0
++	&& SP->_slk != 0
++	&& !opts
++	&& color_pair_number >= 0
++	&& color_pair_number < SP->_pair_limit) {
+ 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
+ 	SetAttr(SP->_slk->attr, attr);
+ 	if (color_pair_number > 0) {
+ 	    SetPair(SP->_slk->attr, color_pair_number);
+ 	}
+ 	TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
+-	returnCode(OK);
+-    } else
+-	returnCode(ERR);
++	code = OK;
++    }
++    returnCode(code);
+ }
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c
+--- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c	2005-01-28 13:11:53.000000000 -0800
++++ ncurses-5.7/ncurses/base/lib_slkcolor.c	2009-01-27 16:45:05.088820784 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2009 Free 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:  Juergen Pfeifer, 1998                                          *
+- *     and:  Thomas E. Dickey 2005                                          *
++ *     and:  Thomas E. Dickey 2005-on                                       *
+  ****************************************************************************/
+ 
+ /*
+@@ -38,19 +38,23 @@
+  */
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $")
++MODULE_ID("$Id: lib_slkcolor.c,v 1.13 2009/01/25 00:48:07 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ slk_color(short color_pair_number)
+ {
++    int code = ERR;
++
+     T((T_CALLED("slk_color(%d)"), color_pair_number));
+ 
+-    if (SP != 0 && SP->_slk != 0 &&
+-	color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
++    if (SP != 0
++	&& SP->_slk != 0
++	&& color_pair_number >= 0
++	&& color_pair_number < SP->_pair_limit) {
+ 	TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
+ 	SetPair(SP->_slk->attr, color_pair_number);
+ 	TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
+-	returnCode(OK);
+-    } else
+-	returnCode(ERR);
++	code = OK;
++    }
++    returnCode(code);
+ }
+diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
+--- ncurses-5.7.orig/ncurses/curses.priv.h	2008-10-04 14:37:45.000000000 -0700
++++ ncurses-5.7/ncurses/curses.priv.h	2009-01-27 16:45:05.088820784 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 Free 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.394 2008/10/04 21:37:45 tom Exp $
++ * $Id: curses.priv.h,v 1.396 2009/01/24 23:04:59 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -404,6 +404,8 @@
+ #define C_SHIFT 9		/* we need more bits than there are colors */
+ #define C_MASK			((1 << C_SHIFT) - 1)
+ #define PAIR_OF(fg, bg)		((((fg) & C_MASK) << C_SHIFT) | ((bg) & C_MASK))
++#define FORE_OF(c)		(((c) >> C_SHIFT) & C_MASK)
++#define BACK_OF(c)		((c) & C_MASK)
+ #define isDefaultColor(c)	((c) >= COLOR_DEFAULT || (c) < 0)
+ 
+ #define COLOR_DEFAULT		C_MASK
+@@ -794,11 +796,13 @@
+ 	int		_color_count;	/* count of colors in palette	     */
+ 	colorpair_t	*_color_pairs;	/* screen's color pair list	     */
+ 	int		_pair_count;	/* count of color pairs		     */
++	int		_pair_limit;	/* actual limit of color-pairs       */
+ #if NCURSES_EXT_FUNCS
+ 	bool		_default_color; /* use default colors		     */
+ 	bool		_has_sgr_39_49; /* has ECMA default color support    */
+ 	int		_default_fg;	/* assumed default foreground	     */
+ 	int		_default_bg;	/* assumed default background	     */
++	int		_default_pairs;	/* count pairs using default color   */
+ #endif
+ 	chtype		_ok_attributes; /* valid attributes for terminal     */
+ 	chtype		_xmc_suppress;	/* attributes to suppress if xmc     */
+@@ -1519,7 +1523,7 @@
+ extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
+ 
+ /* lib_mouse.c */
+-extern NCURSES_EXPORT(int) _nc_has_mouse (void);
++extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *);
+ 
+ /* lib_mvcur.c */
+ #define INFINITY	1000000	/* cost: too high to use */
+diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
+--- ncurses-5.7.orig/ncurses/Makefile.in	2008-10-18 07:11:54.000000000 -0700
++++ ncurses-5.7/ncurses/Makefile.in	2009-01-27 16:44:58.028366252 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
++# $Id: Makefile.in,v 1.114 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free 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"), #
+@@ -78,7 +78,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
+--- ncurses-5.7.orig/ncurses/tinfo/entries.c	2008-09-27 06:11:10.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/entries.c	2009-01-27 16:44:49.391812822 -0800
+@@ -37,7 +37,7 @@
+ #include <tic.h>
+ #include <term_entry.h>
+ 
+-MODULE_ID("$Id: entries.c,v 1.8 2008/09/27 13:11:10 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.10 2008/12/07 00:11:45 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -117,6 +117,9 @@
+ 
+     T((T_CALLED("_nc_free_tinfo()")));
+ #if NO_LEAKS
++    if (cur_term != 0)
++	del_curterm(cur_term);
++
+     _nc_free_tparm();
+     _nc_tgetent_leaks();
+     _nc_free_entries(_nc_head);
+diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
+--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c	2006-08-19 12:48:38.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/hashed_db.c	2009-01-27 16:44:51.023917306 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2006,2008 Free 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 @@
+  ****************************************************************************/
+ 
+ /****************************************************************************
+- *  Author: Thomas E. Dickey                        2006                    *
++ *  Author: Thomas E. Dickey                        2006-on                 *
+  ****************************************************************************/
+ 
+ #include <curses.priv.h>
+@@ -36,7 +36,7 @@
+ 
+ #if USE_HASHED_DB
+ 
+-MODULE_ID("$Id: hashed_db.c,v 1.13 2006/08/19 19:48:38 tom Exp $")
++MODULE_ID("$Id: hashed_db.c,v 1.14 2008/12/13 20:59:02 tom Exp $")
+ 
+ #if HASHED_DB_API >= 2
+ static DBC *cursor;
+@@ -49,27 +49,30 @@
+ _nc_db_open(const char *path, bool modify)
+ {
+     DB *result = 0;
++    int code;
+ 
+ #if HASHED_DB_API >= 4
+     db_create(&result, NULL, 0);
+-    result->open(result,
+-		 NULL,
+-		 path,
+-		 NULL,
+-		 DB_HASH,
+-		 modify ? DB_CREATE : DB_RDONLY,
+-		 0644);
++    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);
+-    result->open(result,
+-		 path,
+-		 NULL,
+-		 DB_HASH,
+-		 modify ? DB_CREATE : DB_RDONLY,
+-		 0644);
++    if ((code = result->open(result,
++			     path,
++			     NULL,
++			     DB_HASH,
++			     modify ? DB_CREATE : DB_RDONLY,
++			     0644)) != 0) {
++	result = 0;
++    }
+ #elif HASHED_DB_API >= 2
+-    int code;
+-
+     if ((code = db_open(path,
+ 			DB_HASH,
+ 			modify ? DB_CREATE : DB_RDONLY,
+@@ -77,21 +80,22 @@
+ 			(DB_ENV *) 0,
+ 			(DB_INFO *) 0,
+ 			&result)) != 0) {
+-	T(("cannot open %s: %s", path, strerror(code)));
+ 	result = 0;
+-    } else {
+-	T(("opened %s", path));
+     }
+ #else
+-    result = dbopen(path,
+-		    modify ? (O_CREAT | O_RDWR) : O_RDONLY,
+-		    0644,
+-		    DB_HASH,
+-		    NULL);
++    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)));
+     }
+-#endif
+     return result;
+ }
+ 
+diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
+--- ncurses-5.7.orig/ncurses/tty/tty_update.c	2008-08-30 13:08:19.000000000 -0700
++++ ncurses-5.7/ncurses/tty/tty_update.c	2009-01-27 16:45:05.088820784 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -78,7 +78,7 @@
+ #include <ctype.h>
+ #include <term.h>
+ 
+-MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $")
++MODULE_ID("$Id: tty_update.c,v 1.247 2009/01/25 00:48:36 tom Exp $")
+ 
+ /*
+  * This define controls the line-breakout optimization.  Every once in a
+@@ -1165,8 +1165,8 @@
+ 		newPair = GetPair(newLine[n]);
+ 		if (oldPair != newPair
+ 		    && unColor(oldLine[n]) == unColor(newLine[n])) {
+-		    if (oldPair < COLOR_PAIRS
+-			&& newPair < COLOR_PAIRS
++		    if (oldPair < SP->_pair_limit
++			&& newPair < SP->_pair_limit
+ 			&& SP->_color_pairs[oldPair] == SP->_color_pairs[newPair]) {
+ 			SetPair(oldLine[n], GetPair(newLine[n]));
+ 		    }
+diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
+--- ncurses-5.7.orig/NEWS	2008-11-01 17:56:22.000000000 -0700
++++ ncurses-5.7/NEWS	2009-01-27 16:45:05.084820505 -0800
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2008,2009 Free 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.1320 2008/11/02 00:56:22 tom Exp $
++-- $Id: NEWS,v 1.1360 2009/01/24 23:06:51 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,133 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20090124
++	+ modify init_pair() to allow caller to create extra color pairs beyond
++	  the color_pairs limit, which use default colors (request by Emanuele
++	  Giaquinta).
++	+ add misc/terminfo.tmp and misc/*.pc to "sources" rule.
++	+ fix typo "==" where "=" is needed in ncurses-config.in and
++	  gen-pkgconfig.in files (Debian #512161).
++
++20090117
++	+ add -shared option to MK_SHARED_LIB when -Bsharable is used, for
++	  *BSD's, without which "main" might be one of the shared library's
++	  dependencies (report/analysis by Ken Dickey).
++	+ modify waddch_literal(), updating line-pointer after a multicolumn
++	  character is found to not fit on the current row, and wrapping is
++	  done.  Since the line-pointer was not updated, the wrapped
++	  multicolumn character was written to the beginning of the current row
++	  (cf: 20041023, reported by "Nick" regarding problem with ncmpc
++	  http://musicpd.org/mantis/bug_view_page.php?bug_id=1930).
++
++20090110
++	+ add screen.Eterm terminfo entry (GenToo #124887) -TD
++	+ modify adacurses-config to look for ".ali" files in the adalib
++	  directory.
++	+ correct install for Ada95, which omitted libAdaCurses.a used in
++	  adacurses-config
++	+ change install for adacurses-config to provide additional flavors
++	  such as adacursesw-config, for ncursesw (GenToo #167849).
++
++20090105
++	+ remove undeveloped feature in ncurses-config.in for setting
++	  prefix variable.
++	+ recent change to ncurses-config.in did not take into account the
++	  --disable-overwrite option, which sets $includedir to the
++	  subdirectory and using just that for a -I option does not work - fix
++	  (report by Frederic L W Meunier).
++
++20090104
++	+ modify gen-pkgconfig.in to eliminate a dependency on rpath when
++	  deciding whether to add $LIBS to --libs output; that should be shown
++	  for the ncurses and tinfo libraries without taking rpath into
++	  account.
++	+ fix an overlooked change from $AR_OPTS to $ARFLAGS in mk-1st.awk,
++	  used in static libraries (report by Marty Jack).
++
++20090103
++	+ add a configure-time check to pick a suitable value for
++	  CC_SHARED_OPTS for Solaris (report by Dagobert Michelsen).
++	+ add configure --with-pkg-config and --enable-pc-files options, along
++	  with misc/gen-pkgconfig.in which can be used to generate ".pc" files
++	  for pkg-config (request by Jan Engelhardt).
++	+ use $includedir symbol in misc/ncurses-config.in, add --includedir
++	  option.
++	+ change makefiles to use $ARFLAGS rather than $AR_OPTS, provide a
++	  configure check to detect whether a "-" is needed before "ar"
++	  options.
++	+ update config.guess, config.sub from
++		http://savannah.gnu.org/projects/config
++
++20081227
++	+ modify mk-1st.awk to work with extra categories for tinfo library.
++	+ modify configure script to allow building shared libraries with gcc
++	  on AIX 5 or 6 (adapted from patch by Lital Natan).
++
++20081220
++	+ modify to omit the opaque-functions from lib_gen.o when
++	  --disable-ext-funcs is used.
++	+ add test/clip_printw.c to illustrate how to use printw without
++	  wrapping.
++	+ modify ncurses 'F' test to demo wborder_set() with colored lines.
++	+ modify ncurses 'f' test to demo wborder() with colored lines.
++
++20081213
++	+ add check for failure to open hashed-database needed for db4.6
++	  (GenToo #245370).
++	+ corrected --without-manpages option; previous change only suppressed
++	  the auxiliary rules install.man and uninstall.man
++	+ add case for FreeMINT to configure macro CF_XOPEN_SOURCE (patch from
++	  GenToo #250454).
++	+ fixes from NetBSD port at
++	  http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/ncurses/patches
++	  patch-ac (build-fix for DragonFly)
++	  patch-ae (use INSTALL_SCRIPT for installing misc/ncurses*-config).
++	+ improve configure script macros CF_HEADER_PATH and CF_LIBRARY_PATH
++	  by adding CFLAGS, CPPFLAGS and LDFLAGS, LIBS values to the
++	  search-lists.
++	+ correct title string for keybound manpage (patch by Frederic Culot,
++	  OpenBSD documentation/6019),
++
++20081206
++	+ move del_curterm() call from _nc_freeall() to _nc_leaks_tinfo() to
++	  work for progs/clear, progs/tabs, etc.
++	+ correct buffer-size after internal resizing of wide-character
++	  set_field_buffer(), broken in 20081018 changes (report by Mike Gran).
++	+ add "-i" option to test/filter.c to tell it to use initscr() rather
++	  than newterm(), to investigate report on comp.unix.programmer that
++	  ncurses would clear the screen in that case (it does not - the issue
++	  was xterm's alternate screen feature).
++	+ add check in mouse-driver to disable connection if GPM returns a
++	  zero, indicating that the connection is closed (Debian #506717,
++	  adapted from patch by Samuel Thibault).
++
++20081129
++	+ improve a workaround in adding wide-characters, when a control
++	  character is found.  The library (cf: 20040207) uses unctrl() to
++	  obtain a printable version of the control character, but was not
++	  passing color or video attributes.
++	+ improve test/ncurses.c 'a' test, using unctrl() more consistently to
++	  display meta-characters.
++	+ turn on _XOPEN_CURSES definition in curses.h
++	+ add eterm-color entry (report by Vincent Lefevre) -TD
++	+ correct use of key_name() in test/ncurses.c 'A' test, which only
++	  displays wide-characters, not key-codes since 20070612 (report by
++	  Ricardo Cantu).
++
++20081122
++	+ change _nc_has_mouse() to has_mouse(), reflect its use in C++ and
++	  Ada95 (patch by Juergen Pfeifer).
++	+ document in TO-DO an issue with Cygwin's package for GNAT (report
++	  by Mike Dennison).
++	+ improve error-checking of command-line options in "tabs" program.
++
++20081115
++	+ change several terminfo entries to make consistent use of ANSI
++	  clear-all-tabs -TD
++	+ add "tabs" program (prompted by Debian #502260).
++	+ add configure --without-manpages option (request by Mike Frysinger).
++
+ 20081102 5.7 release for upload to ftp.gnu.org
+ 
+ 20081025
+diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
+--- ncurses-5.7.orig/panel/Makefile.in	2007-04-28 07:56:11.000000000 -0700
++++ ncurses-5.7/panel/Makefile.in	2009-01-27 16:44:58.028366252 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
++# $Id: Makefile.in,v 1.53 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free 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"), #
+@@ -71,7 +71,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
+--- ncurses-5.7.orig/progs/Makefile.in	2008-09-07 06:58:55.000000000 -0700
++++ ncurses-5.7/progs/Makefile.in	2009-01-27 16:44:45.103540717 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
++# $Id: Makefile.in,v 1.80 2008/11/15 19:04:19 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2008 Free 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"), #
+@@ -124,7 +124,7 @@
+ 	transform.h
+ 
+ # tic relies on direct access to the terminfo database
+-GET_PROGS = infocmp$x clear$x tput$x tset$x toe$x
++GET_PROGS = infocmp$x clear$x tabs$x tput$x tset$x toe$x
+ PUT_PROGS = @MAKE_TERMINFO@ tic$x
+ PROGS = $(PUT_PROGS) $(GET_PROGS)
+ 
+@@ -159,6 +159,7 @@
+ actual_infotocap = `echo infotocap$x| $(TRANSFORM)`
+ actual_init      = `echo init$x|      $(TRANSFORM)`
+ actual_reset     = `echo reset$x|     $(TRANSFORM)`
++actual_tabs      = `echo tabs$x|      $(TRANSFORM)`
+ actual_tic       = `echo tic$x|       $(TRANSFORM)`
+ actual_toe       = `echo toe$x|       $(TRANSFORM)`
+ actual_tput      = `echo tput$x|      $(TRANSFORM)`
+@@ -187,6 +188,7 @@
+ @MAKE_TERMINFO@	(cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(DESTDIR)$(bindir)/$(actual_clear)
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(DESTDIR)$(bindir)/$(actual_tabs)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(DESTDIR)$(bindir)/$(actual_tput)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
+ 	@echo "linking $(actual_reset) to $(actual_tset)"
+@@ -200,6 +202,7 @@
+ @MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
++	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
+ 	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
+@@ -230,6 +233,12 @@
+ clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
+ 	@ECHO_LINK@ $(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 $@
++
+ DEPS_TPUT = \
+ 	$(MODEL)/tput$o
+ 
+@@ -289,6 +298,7 @@
+ @MAKE_TERMINFO@	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/toe.c     $(srcdir)/dump_entry.c $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/clear.c                          $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/infocmp.c $(srcdir)/dump_entry.c $(LINT_LIBS)
++	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tabs.c                           $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tput.c                           $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tset.c    $(srcdir)/dump_entry.c $(LINT_LIBS)
+ 
+diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
+--- ncurses-5.7.orig/progs/modules	2006-12-23 16:53:21.000000000 -0800
++++ ncurses-5.7/progs/modules	2009-01-27 16:44:45.103540717 -0800
+@@ -1,7 +1,7 @@
+-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
++# $Id: modules,v 1.14 2008/11/15 16:26:48 tom Exp $
+ # Program modules (some are in ncurses lib!)
+ ##############################################################################
+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2006,2008 Free 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"), #
+@@ -37,6 +37,7 @@
+ toe		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
+ dump_entry	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
+ infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
++tabs		progs		$(srcdir)	$(HEADER_DEPS)
+ tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h termsort.c
+ tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
+ 
+diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
+--- ncurses-5.7.orig/progs/tabs.c	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/progs/tabs.c	2009-01-27 16:44:46.515630395 -0800
+@@ -0,0 +1,506 @@
++/****************************************************************************
++ * Copyright (c) 2008 Free 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                        2008                    *
++ ****************************************************************************/
++
++/*
++ * tabs.c --  set terminal hard-tabstops
++ */
++
++#define USE_LIBTINFO
++#include <progs.priv.h>
++
++MODULE_ID("$Id: tabs.c,v 1.15 2008/11/23 00:47:51 tom Exp $")
++
++static void usage(void) GCC_NORETURN;
++
++static int max_cols;
++
++static int
++putch(int c)
++{
++    return putchar(c);
++}
++
++static void
++do_tabs(int *tab_list)
++{
++    int last = 1;
++    int stop;
++
++    putchar('\r');
++    while ((stop = *tab_list++) > 0) {
++	if (last < stop) {
++	    while (last++ < stop) {
++		if (last > max_cols)
++		    break;
++		putchar(' ');
++	    }
++	}
++	if (stop <= max_cols) {
++	    tputs(tparm(set_tab, stop), 1, putch);
++	    last = stop;
++	} else {
++	    break;
++	}
++    }
++    putchar('\n');
++}
++
++static int *
++decode_tabs(const char *tab_list)
++{
++    int *result = typeCalloc(int, strlen(tab_list) + (unsigned) max_cols);
++    int n = 0;
++    int value = 0;
++    int prior = 0;
++    int ch;
++
++    if (result != 0) {
++	while ((ch = *tab_list++) != '\0') {
++	    if (isdigit(UChar(ch))) {
++		value *= 10;
++		value += (ch - '0');
++	    } else if (ch == ',') {
++		result[n] = value + prior;
++		if (n > 0 && value <= result[n - 1]) {
++		    fprintf(stderr,
++			    "tab-stops are not in increasing order\n");
++		    free(result);
++		    result = 0;
++		    break;
++		}
++		++n;
++		value = 0;
++		prior = 0;
++	    } else if (ch == '+') {
++		if (n)
++		    prior = result[n - 1];
++	    }
++	}
++    }
++
++    if (result != 0) {
++	/*
++	 * If there is only one value, then it is an option such as "-8".
++	 */
++	if ((n == 0) && (value > 0)) {
++	    int step = value;
++	    while (n < max_cols - 1) {
++		result[n++] = value;
++		value += step;
++	    }
++	}
++
++	/*
++	 * Add the last value, if any.
++	 */
++	result[n++] = value;
++	result[n] = 0;
++    }
++    return result;
++}
++
++static void
++print_ruler(int *tab_list)
++{
++    int last = 0;
++    int stop;
++    int n;
++
++    /* first print a readable ruler */
++    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)));
++	printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer);
++    }
++    putchar('\n');
++
++    /* now, print '*' for each stop */
++    for (n = 0, last = 0; (tab_list[n] > 0) && (last < max_cols); ++n) {
++	stop = tab_list[n];
++	while (++last < stop) {
++	    if (last <= max_cols) {
++		putchar('-');
++	    } else {
++		break;
++	    }
++	}
++	if (last <= max_cols) {
++	    putchar('*');
++	    last = stop;
++	} else {
++	    break;
++	}
++    }
++    while (++last <= max_cols)
++	putchar('-');
++    putchar('\n');
++}
++
++/*
++ * Write an '*' on each tabstop, to demonstrate whether it lines up with the
++ * ruler.
++ */
++static void
++write_tabs(int *tab_list)
++{
++    int stop;
++
++    while ((stop = *tab_list++) > 0 && stop <= max_cols) {
++	fputs((stop == 1) ? "*" : "\t*", stdout);
++    };
++    /* also show a tab _past_ the stops */
++    if (stop < max_cols)
++	fputs("\t+", stdout);
++    putchar('\n');
++}
++
++/*
++ * Trim leading/trailing blanks, as well as blanks after a comma.
++ * Convert embedded blanks to commas.
++ */
++static char *
++trimmed_tab_list(const char *source)
++{
++    char *result = strdup(source);
++    int ch, j, k, last;
++
++    if (result != 0) {
++	for (j = k = last = 0; result[j] != 0; ++j) {
++	    ch = UChar(result[j]);
++	    if (isspace(ch)) {
++		if (last == '\0') {
++		    continue;
++		} else if (isdigit(last) || last == ',') {
++		    ch = ',';
++		}
++	    } else if (ch == ',') {
++		;
++	    } else {
++		if (last == ',')
++		    result[k++] = last;
++		result[k++] = ch;
++	    }
++	    last = ch;
++	}
++	result[k] = '\0';
++    }
++    return result;
++}
++
++static bool
++comma_is_needed(const char *source)
++{
++    bool result = FALSE;
++
++    if (source != 0) {
++	unsigned len = strlen(source);
++	if (len != 0)
++	    result = (source[len - 1] != ',');
++    } else {
++	result = FALSE;
++    }
++    return result;
++}
++
++/*
++ * Add a command-line parameter to the tab-list.  It can be blank- or comma-
++ * separated (or a mixture).  For simplicity, empty tabs are ignored, e.g.,
++ *	tabs 1,,6,11
++ *	tabs 1,6,11
++ * are treated the same.
++ */
++static const char *
++add_to_tab_list(char **append, const char *value)
++{
++    char *result = *append;
++    char *copied = trimmed_tab_list(value);
++
++    if (copied != 0 && *copied != '\0') {
++	const char *comma = ",";
++	unsigned need = 1 + strlen(copied);
++
++	if (*copied == ',')
++	    comma = "";
++	else if (!comma_is_needed(*append))
++	    comma = "";
++
++	need += strlen(comma);
++	if (*append != 0)
++	    need += strlen(*append);
++
++	result = malloc(need);
++	if (result != 0) {
++	    *result = '\0';
++	    if (*append != 0) {
++		strcpy(result, *append);
++		free(*append);
++	    }
++	    strcat(result, comma);
++	    strcat(result, copied);
++	}
++
++	*append = result;
++    }
++    return result;
++}
++
++/*
++ * Check for illegal characters in the tab-list.
++ */
++static bool
++legal_tab_list(const char *program, const char *tab_list)
++{
++    bool result = TRUE;
++
++    if (tab_list != 0 && *tab_list != '\0') {
++	if (comma_is_needed(tab_list)) {
++	    int n, ch;
++	    for (n = 0; tab_list[n] != '\0'; ++n) {
++		ch = UChar(tab_list[n]);
++		if (!(isdigit(ch) || ch == ',')) {
++		    fprintf(stderr,
++			    "%s: unexpected character found '%c'\n",
++			    program, ch);
++		    result = FALSE;
++		    break;
++		}
++	    }
++	} else {
++	    fprintf(stderr, "%s: trailing comma found '%s'\n", program, tab_list);
++	    result = FALSE;
++	}
++    } else {
++	fprintf(stderr, "%s: no tab-list given\n", program);
++	result = FALSE;
++    }
++    return result;
++}
++
++static void
++usage(void)
++{
++    static const char *msg[] =
++    {
++	"Usage: tabs [options] [tabstop-list]"
++	,""
++	,"Options:"
++	,"  -0       reset tabs"
++	,"  -8       set tabs to standard interval"
++	,"  -a       Assembler, IBM S/370, first format"
++	,"  -a2      Assembler, IBM S/370, second format"
++	,"  -c       COBOL, normal format"
++	,"  -c2      COBOL compact format"
++	,"  -c3      COBOL compact format extended"
++	,"  -d       debug (show ruler with expected/actual tab positions)"
++	,"  -f       FORTRAN"
++	,"  -n       no-op (do not modify terminal settings)"
++	,"  -p       PL/I"
++	,"  -s       SNOBOL"
++	,"  -u       UNIVAC 1100 Assembler"
++	,"  -T name  use terminal type 'name'"
++	,""
++	,"A tabstop-list is an ordered list of column numbers, e.g., 1,11,21"
++	,"or 1,+10,+10 which is the same."
++    };
++    unsigned n;
++
++    fflush(stdout);
++    for (n = 0; n < SIZEOF(msg); ++n) {
++	fprintf(stderr, "%s\n", msg[n]);
++    }
++    ExitProgram(EXIT_FAILURE);
++}
++
++int
++main(int argc, char *argv[])
++{
++    int rc = EXIT_FAILURE;
++    bool debug = FALSE;
++    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;
++
++    if ((term_name = getenv("TERM")) == 0)
++	term_name = "ansi+tabs";
++
++    /* cannot use getopt, since some options are two-character */
++    for (n = 1; n < argc; ++n) {
++	char *option = argv[n];
++	switch (option[0]) {
++	case '-':
++	    while ((ch = *++option) != '\0') {
++		switch (ch) {
++		case 'a':
++		    switch (*option) {
++		    case '\0':
++			tab_list = "1,10,16,36,72";
++			/* Assembler, IBM S/370, first format */
++			break;
++		    case '2':
++			tab_list = "1,10,16,40,72";
++			/* Assembler, IBM S/370, second format */
++			break;
++		    default:
++			usage();
++		    }
++		    break;
++		case 'c':
++		    switch (*option) {
++		    case '\0':
++			tab_list = "1,8,12,16,20,55";
++			/* COBOL, normal format */
++			break;
++		    case '2':
++			tab_list = "1,6,10,14,49";
++			/* COBOL compact format */
++			break;
++		    case '3':
++			tab_list = "1,6,10,14,18,22,26,30,34,38,42,46,50,54,58,62,67";
++			/* COBOL compact format extended */
++			break;
++		    default:
++			usage();
++		    }
++		    break;
++		case 'd':	/* ncurses extension */
++		    debug = TRUE;
++		    break;
++		case 'f':
++		    tab_list = "1,7,11,15,19,23";
++		    /* FORTRAN */
++		    break;
++		case 'n':	/* ncurses extension */
++		    no_op = TRUE;
++		    break;
++		case 'p':
++		    tab_list = "1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61";
++		    /* PL/I */
++		    break;
++		case 's':
++		    tab_list = "1,10,55";
++		    /* SNOBOL */
++		    break;
++		case 'u':
++		    tab_list = "1,12,20,44";
++		    /* UNIVAC 1100 Assembler */
++		    break;
++		case 'T':
++		    ++n;
++		    if (*++option != '\0') {
++			term_name = option;
++		    } else {
++			term_name = argv[n++];
++		    }
++		    option += ((int) strlen(option)) - 1;
++		    continue;
++		default:
++		    if (isdigit(UChar(*option))) {
++			tab_list = option;
++			++n;
++		    } else {
++			usage();
++		    }
++		    option += ((int) strlen(option)) - 1;
++		    break;
++		}
++	    }
++	    break;
++	case '+':
++	    while ((ch = *++option) != '\0') {
++		switch (ch) {
++		case 'm':
++		    mar_list = option;
++		    break;
++		default:
++		    usage();
++		}
++	    }
++	    break;
++	default:
++	    if (append != 0) {
++		if (tab_list != (const char *) append) {
++		    /* one of the predefined options was used */
++		    free(append);
++		    append = 0;
++		}
++	    }
++	    tab_list = add_to_tab_list(&append, option);
++	    option += ((int) strlen(option)) - 1;
++	    break;
++	}
++    }
++
++    setupterm(term_name, STDOUT_FILENO, (int *) 0);
++
++    max_cols = (columns > 0) ? columns : 80;
++
++    if (!VALID_STRING(clear_all_tabs)) {
++	fprintf(stderr,
++		"%s: terminal type '%s' cannot reset tabs\n",
++		argv[0], term_name);
++    } else if (!VALID_STRING(set_tab)) {
++	fprintf(stderr,
++		"%s: terminal type '%s' cannot set tabs\n",
++		argv[0], term_name);
++    } else if (legal_tab_list(argv[0], tab_list)) {
++	int *list = decode_tabs(tab_list);
++
++	if (!no_op)
++	    tputs(clear_all_tabs, 1, putch);
++
++	if (list != 0) {
++	    if (!no_op)
++		do_tabs(list);
++	    if (debug) {
++		fflush(stderr);
++		printf("tabs %s\n", tab_list);
++		print_ruler(list);
++		write_tabs(list);
++	    }
++	    free(list);
++	} else if (debug) {
++	    fflush(stderr);
++	    printf("tabs %s\n", tab_list);
++	}
++	rc = EXIT_SUCCESS;
++    }
++    if (append != 0)
++	free(append);
++    ExitProgram(rc);
++}
+diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
+--- ncurses-5.7.orig/test/clip_printw.c	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/test/clip_printw.c	2009-01-27 16:44:52.892037156 -0800
+@@ -0,0 +1,360 @@
++/****************************************************************************
++ * Copyright (c) 2008 Free 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: clip_printw.c,v 1.1 2008/12/20 21:03:06 tom Exp $
++ *
++ * demonstrate how to use printw without wrapping.
++ */
++
++#include <test.priv.h>
++
++#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
++#define COLOR_DEFAULT (-1)
++
++typedef struct {
++    unsigned c;
++    unsigned v;
++    int status;
++    int pair;
++    unsigned attr;
++    int count;
++    int ch;
++    const char *c_msg;
++    const char *v_msg;
++    int y_val;
++    int x_val;
++    int y_beg, x_beg;
++    int y_max, x_max;
++} STATUS;
++
++static int
++clip_wprintw(WINDOW *win, const char *fmt,...)
++{
++    int y0, x0, y1, x1, width;
++    WINDOW *sub;
++    va_list ap;
++    int rc;
++
++    /*
++     * Allocate a single-line derived window extending from the current
++     * cursor position to the end of the current line in the given window.
++     * Disable scrolling in the derived window.
++     */
++    getyx(win, y0, x0);
++    width = getmaxx(win) - x0;
++    sub = derwin(win, 1, width, y0, x0);
++    scrollok(sub, FALSE);
++
++    /*
++     * Print the text.
++     */
++    va_start(ap, fmt);
++    rc = vw_printw(sub, fmt, ap);
++    va_end(ap);
++
++    getyx(sub, y1, x1);
++    delwin(sub);
++
++    wmove(win, y1 + y0, x1 + x0);
++
++    return rc;
++}
++
++static const char *
++color_params(unsigned state, int *pair)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	int pair;
++	int fg, bg;
++	const char *msg;
++    } table[] = {
++	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
++	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
++	{ 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
++    };
++    /* *INDENT-ON* */
++
++    static bool first = TRUE;
++    const char *result = 0;
++
++    if (has_colors()) {
++	if (first) {
++	    unsigned n;
++
++	    start_color();
++	    for (n = 0; n < SIZEOF(table); ++n) {
++		init_pair(table[n].pair, table[n].fg, table[n].bg);
++	    }
++	}
++	if (state < SIZEOF(table)) {
++	    *pair = table[state].pair;
++	    result = table[state].msg;
++	}
++    }
++    return result;
++}
++
++static const char *
++video_params(unsigned state, unsigned *attr)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	unsigned attr;
++	const char *msg;
++    } table[] = {
++	{ A_NORMAL,	"normal" },
++	{ A_BOLD,	"bold" },
++	{ A_REVERSE,	"reverse" },
++	{ A_UNDERLINE,	"underline" },
++	{ A_BLINK, 	"blink" },
++    };
++    /* *INDENT-ON* */
++
++    const char *result = 0;
++
++    if (state < SIZEOF(table)) {
++	*attr = table[state].attr;
++	result = table[state].msg;
++    }
++    return result;
++}
++
++/* fill the window with a test-pattern */
++static void
++fill_window(WINDOW *win)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 0, 0);
++    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
++    }
++    wmove(win, y, x);
++}
++
++static void
++show_status(WINDOW *win, STATUS * sp)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 0, 0);
++    wprintw(win, "Count %d", sp->count);
++    if (sp->v_msg != 0)
++	wprintw(win, " Video %s", sp->v_msg);
++    if (sp->c_msg != 0)
++	wprintw(win, " Color %s", sp->c_msg);
++    wprintw(win, " (%d)", sp->status);
++    wclrtoeol(win);
++    wmove(win, y, x);
++}
++
++static void
++do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++{
++    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
++			  sp->y_beg + 1, sp->x_beg + 1);
++
++    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
++
++	if (win2 != 0) {
++	    box(win1, 0, 0);
++	    wrefresh(win1);
++	    func(win2);
++
++	    delwin(win2);
++	} else {
++	    beep();
++	}
++	delwin(win1);
++	touchwin(win);
++    } else {
++	beep();
++    }
++}
++
++static void
++init_status(WINDOW *win, STATUS * sp)
++{
++    memset(sp, 0, sizeof(*sp));
++    sp->c = 99;
++    sp->v = 99;
++    sp->ch = ' ';
++
++    keypad(win, TRUE);
++    fill_window(win);
++
++    getbegyx(win, sp->y_beg, sp->x_beg);
++    getmaxyx(win, sp->y_max, sp->x_max);
++}
++
++static void
++show_help(WINDOW *win)
++{
++    static const char *table[] =
++    {
++	"Basic commands:"
++	,"Use h/j/k/l or arrow keys to move the cursor."
++	,"Set the count parameter for clip_wprintw by entering digits 0-9."
++	,""
++	,"Other commands:"
++	,"space toggles through the set of video attributes and colors."
++	,"t     touches (forces repaint) of the current line."
++	,".     calls clip_wprintw at the current position with the given count."
++	,"=     resets count to zero."
++	,"?     shows this help-window"
++	,""
++    };
++
++    int y_max, x_max;
++    int row;
++
++    getmaxyx(win, y_max, x_max);
++    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
++	mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
++    }
++    while (wgetch(win) != 'q')
++	beep();
++}
++
++static void
++update_status(WINDOW *win, STATUS * sp)
++{
++    switch (sp->ch) {
++    case ' ':			/* next test-iteration */
++	if (has_colors()) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++		}
++	    }
++	} else {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++	    }
++	}
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case KEY_LEFT:
++    case 'h':
++	if (sp->x_val > 0)
++	    wmove(win, sp->y_val, --(sp->x_val));
++	break;
++    case KEY_DOWN:
++    case 'j':
++	if (sp->y_val < sp->y_max)
++	    wmove(win, ++(sp->y_val), sp->x_val);
++	break;
++    case KEY_UP:
++    case 'k':
++	if (sp->y_val > 0)
++	    wmove(win, --(sp->y_val), sp->x_val);
++	break;
++    case KEY_RIGHT:
++    case 'l':
++	if (sp->x_val < sp->x_max)
++	    wmove(win, sp->y_val, ++(sp->x_val));
++	break;
++    case 't':
++	touchline(win, sp->y_val, 1);
++	break;
++    case '=':
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case '?':
++	do_subwindow(win, sp, show_help);
++	break;
++    default:
++	if (isdigit(sp->ch)) {
++	    sp->count = (sp->count * 10) + (sp->ch - '0');
++	    show_status(win, sp);
++	} else {
++	    beep();
++	}
++	break;
++    }
++}
++
++static void
++test_clipping(WINDOW *win)
++{
++    STATUS st;
++    char fmt[80];
++    char *buffer;
++    unsigned j, need;
++
++    init_status(win, &st);
++
++    do {
++	switch (st.ch) {
++	case '.':		/* change from current position */
++	    wattrset(win, st.attr | COLOR_PAIR(st.pair));
++	    if (st.count > 0) {
++		need = st.count + 1;
++		sprintf(fmt, "%%c%%%ds%%c", st.count);
++	    } else {
++		need = getmaxx(win) - 1;
++		strcpy(fmt, "%c%s%c");
++	    }
++	    if ((buffer = typeMalloc(char, need)) != 0) {
++		for (j = 0; j < need; ++j) {
++		    buffer[j] = 'A' + (j % 26);
++		}
++		buffer[need - 1] = '\0';
++		st.status = clip_wprintw(win, fmt, '[', buffer, ']');
++	    }
++	    break;
++	case 'w':
++	    do_subwindow(win, &st, test_clipping);
++	    break;
++	case 'q':
++	    return;
++	default:
++	    update_status(win, &st);
++	    break;
++	}
++    } while ((st.ch = wgetch(win)) != ERR);
++}
++
++int
++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
++{
++    initscr();
++    cbreak();
++    noecho();
++
++    test_clipping(stdscr);
++    endwin();
++
++    ExitProgram(EXIT_SUCCESS);
++}
+diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
+--- ncurses-5.7.orig/test/demo_forms.c	2008-10-18 13:38:20.000000000 -0700
++++ ncurses-5.7/test/demo_forms.c	2009-01-27 16:44:52.892037156 -0800
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.30 2008/10/18 20:38:20 tom Exp $
++ * $Id: demo_forms.c,v 1.31 2008/12/20 19:23:00 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+@@ -97,6 +97,8 @@
+     FIELD *f = new_field(rows, cols, frow, fcol, o_value, 1);
+ 
+     if (f) {
++	FieldAttrs *ptr;
++
+ 	set_field_back(f, A_UNDERLINE);
+ 	/*
+ 	 * If -j and -d options are combined, -j loses.  It is documented in
+@@ -122,7 +124,12 @@
+ 	/*
+ 	 * The userptr is used in edit_field.c's inactive_field().
+ 	 */
+-	set_field_userptr(f, (void *) (long) field_back(f));
++	ptr = (FieldAttrs *) field_userptr(f);
++	if (ptr == 0) {
++	    ptr = typeCalloc(FieldAttrs, 1);
++	    ptr->background = field_back(f);
++	}
++	set_field_userptr(f, (void *) ptr);
+ 	if (t_value)
+ 	    set_field_buffer(f, 0, t_value);
+     }
+diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
+--- ncurses-5.7.orig/test/edit_field.c	2008-10-18 13:40:20.000000000 -0700
++++ ncurses-5.7/test/edit_field.c	2009-01-27 16:44:52.892037156 -0800
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: edit_field.c,v 1.14 2008/10/18 20:40:20 tom Exp $
++ * $Id: edit_field.c,v 1.15 2008/12/20 19:23:01 tom Exp $
+  *
+  * A wrapper for form_driver() which keeps track of the user's editing changes
+  * for each field, and makes the result available as a null-terminated string
+@@ -294,8 +294,8 @@
+ static void
+ inactive_field(FIELD * f)
+ {
+-    void *ptr = field_userptr(f);
+-    set_field_back(f, (chtype) ptr);
++    FieldAttrs *ptr = (FieldAttrs *) field_userptr(f);
++    set_field_back(f, ptr->background);
+ }
+ 
+ int
+diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
+--- ncurses-5.7.orig/test/edit_field.h	2006-06-03 09:38:57.000000000 -0700
++++ ncurses-5.7/test/edit_field.h	2009-01-27 16:44:52.896037435 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 2003-2006,2008 Free 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: edit_field.h,v 1.5 2006/06/03 16:38:57 tom Exp $
++ * $Id: edit_field.h,v 1.6 2008/12/20 19:23:18 tom Exp $
+  *
+  * Interface of edit_field.c
+  */
+@@ -43,6 +43,10 @@
+ #define MY_EDT_MODE	EDIT_FIELD('e')
+ #define MY_INS_MODE	EDIT_FIELD('t')
+ 
++typedef struct {
++    chtype background;
++} FieldAttrs;
++
+ extern void help_edit_field(void);
+ extern int edit_field(FORM * form, int *result);
+ 
+diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
+--- ncurses-5.7.orig/test/filter.c	2006-12-09 08:53:47.000000000 -0800
++++ ncurses-5.7/test/filter.c	2009-01-27 16:44:49.391812822 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2006,2008 Free 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.11 2006/12/09 16:53:47 tom Exp $
++ * $Id: filter.c,v 1.12 2008/12/06 21:59:27 tom Exp $
+  */
+ #include <test.priv.h>
+ 
+@@ -78,16 +78,50 @@
+     return code;
+ }
+ 
++static void
++usage(void)
++{
++    static const char *msg[] =
++    {
++	"Usage: filter [options]"
++	,""
++	,"Options:"
++	,"  -i   use initscr() rather than newterm()"
++    };
++    unsigned 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)
++main(int argc, char *argv[])
+ {
++    int ch;
+     char buffer[80];
+     attr_t underline;
++    bool i_option = FALSE;
+ 
+     setlocale(LC_ALL, "");
+ 
++    while ((ch = getopt(argc, argv, "i")) != -1) {
++	switch (ch) {
++	case 'i':
++	    i_option = TRUE;
++	    break;
++	default:
++	    usage();
++	}
++    }
++
++    printf("starting filter program using %s...\n",
++	   i_option ? "initscr" : "newterm");
+     filter();
+-    (void) newterm((char *) 0, stdout, stdin);
++    if (i_option) {
++	initscr();
++    } else {
++	(void) newterm((char *) 0, stdout, stdin);
++    }
+     cbreak();
+     keypad(stdscr, TRUE);
+ 
+diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
+--- ncurses-5.7.orig/test/insdelln.c	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/test/insdelln.c	2009-01-27 16:44:52.896037435 -0800
+@@ -0,0 +1,380 @@
++/****************************************************************************
++ * Copyright (c) 2008 Free 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: insdelln.c,v 1.1 2008/12/20 22:06:52 tom Exp $
++ *
++ * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
++ */
++
++#include <test.priv.h>
++
++#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
++#define COLOR_DEFAULT (-1)
++
++typedef struct {
++    unsigned c;
++    unsigned v;
++    int pair;
++    unsigned attr;
++    int count;
++    int ch;
++    const char *c_msg;
++    const char *v_msg;
++    int y_val;
++    int x_val;
++    int y_beg, x_beg;
++    int y_max, x_max;
++} STATUS;
++
++static const char *
++color_params(unsigned state, int *pair)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	int pair;
++	int fg, bg;
++	const char *msg;
++    } table[] = {
++	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
++	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
++	{ 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
++    };
++    /* *INDENT-ON* */
++
++    static bool first = TRUE;
++    const char *result = 0;
++
++    if (has_colors()) {
++	if (first) {
++	    unsigned n;
++
++	    start_color();
++	    for (n = 0; n < SIZEOF(table); ++n) {
++		init_pair(table[n].pair, table[n].fg, table[n].bg);
++	    }
++	}
++	if (state < SIZEOF(table)) {
++	    *pair = table[state].pair;
++	    result = table[state].msg;
++	}
++    }
++    return result;
++}
++
++static const char *
++video_params(unsigned state, unsigned *attr)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	unsigned attr;
++	const char *msg;
++    } table[] = {
++	{ A_NORMAL,	"normal" },
++	{ A_BOLD,	"bold" },
++	{ A_REVERSE,	"reverse" },
++	{ A_UNDERLINE,	"underline" },
++	{ A_BLINK, 	"blink" },
++    };
++    /* *INDENT-ON* */
++
++    const char *result = 0;
++
++    if (state < SIZEOF(table)) {
++	*attr = table[state].attr;
++	result = table[state].msg;
++    }
++    return result;
++}
++
++/* fill the window with a test-pattern */
++static void
++fill_window(WINDOW *win)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 1, 0);
++    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
++    }
++    wmove(win, y, x);
++}
++
++static void
++show_status(WINDOW *win, STATUS * sp)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 0, 0);
++    wprintw(win, "Count %d", sp->count);
++    if (sp->v_msg != 0)
++	wprintw(win, " Video %s", sp->v_msg);
++    if (sp->c_msg != 0)
++	wprintw(win, " Color %s", sp->c_msg);
++    wclrtoeol(win);
++    wmove(win, y, x);
++}
++
++static void
++reshow_status(WINDOW *win, STATUS * sp)
++{
++    fill_window(win);
++    show_status(win, sp);
++}
++
++static void
++do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++{
++    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
++			  sp->y_beg + 1, sp->x_beg + 1);
++
++    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
++
++	if (win2 != 0) {
++	    box(win1, 0, 0);
++	    wrefresh(win1);
++	    func(win2);
++
++	    delwin(win2);
++	} else {
++	    beep();
++	}
++	delwin(win1);
++	touchwin(win);
++    } else {
++	beep();
++    }
++}
++
++static void
++init_status(WINDOW *win, STATUS * sp)
++{
++    memset(sp, 0, sizeof(*sp));
++    sp->c = 99;
++    sp->v = 99;
++    sp->ch = ' ';
++
++    keypad(win, TRUE);
++    fill_window(win);
++
++    getbegyx(win, sp->y_beg, sp->x_beg);
++    getmaxyx(win, sp->y_max, sp->x_max);
++}
++
++static void
++show_help(WINDOW *win)
++{
++    static const char *table[] =
++    {
++	"Basic commands:"
++	,"Use h/j/k/l or arrow keys to move the cursor."
++	,"Set the count parameter for insert/delete by entering digits 0-9."
++	,""
++	,"Other commands:"
++	,"space toggles through the set of video attributes and colors."
++	,"t     touches (forces repaint) of the current line."
++	,"i     calls insertln at the current position with the given count."
++	,"d     calls deleteln at the window beginning with the given count."
++	,"I     calls insdelln at the window beginning with the given count."
++	,"D     calls insdelln at the window beginning with the given -count."
++	,"f     refills the window with test-pattern using current attributes."
++	,"w     recur to test windows other than stdscr"
++	,"q     quit"
++	,"=     resets count to zero."
++	,"?     shows this help-window"
++	,""
++	,""
++    };
++
++    int y_max, x_max;
++    int row;
++
++    getmaxyx(win, y_max, x_max);
++    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
++	mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
++    }
++    while (wgetch(win) != 'q')
++	beep();
++}
++
++static void
++update_status(WINDOW *win, STATUS * sp)
++{
++    switch (sp->ch) {
++    case ' ':			/* next test-iteration */
++	if (has_colors()) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++		}
++	    }
++	} else {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++	    }
++	}
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case KEY_LEFT:
++    case 'h':
++	if (sp->x_val > 0)
++	    wmove(win, sp->y_val, --(sp->x_val));
++	break;
++    case KEY_DOWN:
++    case 'j':
++	if (sp->y_val < sp->y_max)
++	    wmove(win, ++(sp->y_val), sp->x_val);
++	break;
++    case KEY_UP:
++    case 'k':
++	if (sp->y_val > 0)
++	    wmove(win, --(sp->y_val), sp->x_val);
++	break;
++    case KEY_RIGHT:
++    case 'l':
++	if (sp->x_val < sp->x_max)
++	    wmove(win, sp->y_val, ++(sp->x_val));
++	break;
++    case 't':
++	touchline(win, sp->y_val, 1);
++	break;
++    case '=':
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case '?':
++	do_subwindow(win, sp, show_help);
++	break;
++    default:
++	if (isdigit(sp->ch)) {
++	    sp->count = (sp->count * 10) + (sp->ch - '0');
++	    show_status(win, sp);
++	} else {
++	    beep();
++	}
++	break;
++    }
++}
++
++static void
++test_winsdelln(WINDOW *win)
++{
++    STATUS st;
++    int n;
++
++    init_status(win, &st);
++
++    do {
++	wattrset(win, st.attr | COLOR_PAIR(st.pair));
++	switch (st.ch) {
++	case 'i':
++	    for (n = 0; n < st.count; ++n)
++		winsertln(win);
++	    break;
++	case 'd':
++	    for (n = 0; n < st.count; ++n)
++		wdeleteln(win);
++	    break;
++	case 'I':
++	    winsdelln(win, st.count);
++	    break;
++	case 'D':
++	    winsdelln(win, -st.count);
++	    break;
++	case 'f':
++	    fill_window(win);
++	    reshow_status(win, &st);
++	    break;
++	case 'w':
++	    do_subwindow(win, &st, test_winsdelln);
++	    break;
++	case 'q':
++	    return;
++	default:
++	    update_status(win, &st);
++	    break;
++	}
++    } while ((st.ch = wgetch(win)) != ERR);
++}
++
++static void
++test_insdelln(void)
++{
++    STATUS st;
++    int n;
++
++    init_status(stdscr, &st);
++
++    do {
++	attrset(st.attr | COLOR_PAIR(st.pair));
++	switch (st.ch) {
++	case 'i':
++	    for (n = 0; n < st.count; ++n)
++		insertln();
++	    break;
++	case 'd':
++	    for (n = 0; n < st.count; ++n)
++		deleteln();
++	    break;
++	case 'I':
++	    insdelln(st.count);
++	    break;
++	case 'D':
++	    insdelln(-st.count);
++	    break;
++	case 'f':
++	    fill_window(stdscr);
++	    reshow_status(stdscr, &st);
++	    break;
++	case 'w':
++	    do_subwindow(stdscr, &st, test_winsdelln);
++	    break;
++	case 'q':
++	    return;
++	default:
++	    update_status(stdscr, &st);
++	    break;
++	}
++    } while ((st.ch = getch()) != ERR);
++}
++
++int
++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
++{
++    initscr();
++    cbreak();
++    noecho();
++
++    test_insdelln();
++    endwin();
++
++    ExitProgram(EXIT_SUCCESS);
++}
+diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
+--- ncurses-5.7.orig/test/modules	2007-08-18 10:57:08.000000000 -0700
++++ ncurses-5.7/test/modules	2009-01-27 16:44:52.896037435 -0800
+@@ -1,4 +1,4 @@
+-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
++# $Id: modules,v 1.37 2008/12/20 21:38:44 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -37,6 +37,7 @@
+ bs		progs		$(srcdir)	$(HEADER_DEPS)
+ cardfile	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/form.h
+ chgat		progs		$(srcdir)	$(HEADER_DEPS)
++clip_printw	progs		$(srcdir)	$(HEADER_DEPS)
+ color_set	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -60,6 +61,7 @@
+ inch_wide	progs		$(srcdir)	$(HEADER_DEPS)
+ inchs		progs		$(srcdir)	$(HEADER_DEPS)
+ ins_wide	progs		$(srcdir)	$(HEADER_DEPS)
++insdelln	progs		$(srcdir)	$(HEADER_DEPS)
+ inserts		progs		$(srcdir)	$(HEADER_DEPS)
+ key_names	progs		$(srcdir)	$(HEADER_DEPS)
+ keynames	progs		$(srcdir)	$(HEADER_DEPS)
+diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
+--- ncurses-5.7.orig/test/ncurses.c	2008-09-27 07:34:58.000000000 -0700
++++ ncurses-5.7/test/ncurses.c	2009-01-27 16:45:05.092821064 -0800
+@@ -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.329 2008/09/27 14:34:58 tom Exp $
++$Id: ncurses.c,v 1.336 2009/01/25 00:39:14 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -569,8 +569,11 @@
+  *
+  ****************************************************************************/
+ 
++#define NUM_GETCH_FLAGS 256
++typedef bool GetchFlags[NUM_GETCH_FLAGS];
++
+ static void
+-setup_getch(WINDOW *win, bool flags[])
++setup_getch(WINDOW *win, GetchFlags flags)
+ {
+     keypad(win, flags['k']);	/* should be redundant, but for testing */
+     meta(win, flags['m']);	/* force this to a known state */
+@@ -581,7 +584,17 @@
+ }
+ 
+ static void
+-wgetch_help(WINDOW *win, bool flags[])
++init_getch(WINDOW *win, GetchFlags flags)
++{
++    memset(flags, FALSE, NUM_GETCH_FLAGS);
++    flags[UChar('k')] = (win == stdscr);
++    flags[UChar('m')] = TRUE;
++
++    setup_getch(win, flags);
++}
++
++static void
++wgetch_help(WINDOW *win, GetchFlags flags)
+ {
+     static const char *help[] =
+     {
+@@ -731,13 +744,10 @@
+     int first_y, first_x;
+     int c;
+     int incount = 0;
+-    bool flags[256];
++    GetchFlags flags;
+     bool blocking = (delay < 0);
+ 
+-    memset(flags, FALSE, sizeof(flags));
+-    flags[UChar('k')] = (win == stdscr);
+-
+-    setup_getch(win, flags);
++    init_getch(win, flags);
+     wtimeout(win, delay);
+     getyx(win, first_y, first_x);
+ 
+@@ -835,12 +845,18 @@
+ 		}
+ #endif
+ 		(void) waddstr(win, keyname(c));
+-	    } else if (c > 0x80) {
+-		unsigned c2 = (unsigned) (c & 0x7f);
+-		if (isprint(c2))
+-		    (void) wprintw(win, "M-%c", UChar(c2));
+-		else
++	    } else if (c >= 0x80) {
++		unsigned c2 = (unsigned) c;
++#if !(defined(NCURSES_VERSION) || defined(_XOPEN_CURSES))
++		/* at least Solaris SVR4 curses breaks unctrl(128), etc. */
++		c2 &= 0x7f;
++#endif
++		if (isprint(c))
++		    (void) wprintw(win, "%c", UChar(c));
++		else if (c2 != UChar(c))
+ 		    (void) wprintw(win, "M-%s", unctrl(c2));
++		else
++		    (void) wprintw(win, "%s", unctrl(c2));
+ 		waddstr(win, " (high-half character)");
+ 	    } else {
+ 		if (isprint(c))
+@@ -854,6 +870,9 @@
+     }
+ 
+     wtimeout(win, -1);
++
++    if (!level)
++	init_getch(win, flags);
+ }
+ 
+ static int
+@@ -978,15 +997,12 @@
+     int first_y, first_x;
+     wint_t c;
+     int incount = 0;
+-    bool flags[256];
++    GetchFlags flags;
+     bool blocking = (delay < 0);
+     int y, x, code;
+     char *temp;
+ 
+-    memset(flags, FALSE, sizeof(flags));
+-    flags[UChar('k')] = (win == stdscr);
+-
+-    setup_getch(win, flags);
++    init_getch(win, flags);
+     wtimeout(win, delay);
+     getyx(win, first_y, first_x);
+ 
+@@ -1096,14 +1112,14 @@
+ 		    resize_wide_boxes(level, win);
+ 		}
+ #endif
+-		(void) waddstr(win, key_name((wchar_t) c));
++		(void) waddstr(win, keyname((wchar_t) c));
+ 	    } else {
++		(void) waddstr(win, key_name((wchar_t) c));
+ 		if (c < 256 && iscntrl(c)) {
+-		    (void) wprintw(win, "%s (control character)", unctrl(c));
++		    (void) wprintw(win, " (control character)");
+ 		} else {
+-		    wchar_t c2 = (wchar_t) c;
+-		    waddnwstr(win, &c2, 1);
+-		    (void) wprintw(win, " = %#x (printable character)", (unsigned) c);
++		    (void) wprintw(win, " = %#x (printable character)",
++				   (unsigned) c);
+ 		}
+ 	    }
+ 	    wgetch_wrap(win, first_y);
+@@ -1111,6 +1127,9 @@
+     }
+ 
+     wtimeout(win, -1);
++
++    if (!level)
++	init_getch(win, flags);
+ }
+ 
+ static void
+@@ -1840,6 +1859,8 @@
+ 	    width = 4;
+ 	} else if (color >= 8) {
+ 	    sprintf(temp, "[%02d]", color);
++	} else if (color < 0) {
++	    strcpy(temp, "default");
+ 	} else {
+ 	    strcpy(temp, the_color_names[color]);
+ 	}
+@@ -1874,6 +1895,8 @@
+     mvwprintw(helpwin, row++, col,
+ 	      "  n/N     toggle text/number on/off");
+     mvwprintw(helpwin, row++, col,
++	      "  r/R     toggle reverse on/off");
++    mvwprintw(helpwin, row++, col,
+ 	      "  w/W     toggle width between 8/16 colors");
+ #if USE_WIDEC_SUPPORT
+     if (wide) {
+@@ -1906,12 +1929,19 @@
+     bool done = FALSE;
+     bool opt_acsc = FALSE;
+     bool opt_bold = FALSE;
+-    bool opt_wide = FALSE;
++    bool opt_revs = FALSE;
+     bool opt_nums = FALSE;
++    bool opt_wide = FALSE;
+     WINDOW *helpwin;
+ 
+-    if (pairs_max > COLOR_PAIRS)
+-	pairs_max = COLOR_PAIRS;
++    if (COLORS * COLORS == COLOR_PAIRS) {
++	int limit = (COLORS - min_colors) * (COLORS - min_colors);
++	if (pairs_max > limit)
++	    pairs_max = limit;
++    } else {
++	if (pairs_max > COLOR_PAIRS)
++	    pairs_max = COLOR_PAIRS;
++    }
+ 
+     while (!done) {
+ 	int shown = 0;
+@@ -1926,12 +1956,14 @@
+ 	    hello = "Hello";
+ 	    per_row = 8;
+ 	}
++	per_row -= min_colors;
+ 
+ 	row_limit = (pairs_max + per_row - 1) / per_row;
+ 
+ 	move(0, 0);
+-	(void) printw("There are %d color pairs and %d colors\n",
+-		      pairs_max, COLORS);
++	(void) printw("There are %d color pairs and %d colors%s\n",
++		      pairs_max, COLORS,
++		      min_colors ? " besides 'default'" : "");
+ 
+ 	clrtobot();
+ 	(void) mvprintw(top + 1, 0,
+@@ -1942,7 +1974,7 @@
+ 
+ 	/* show color names/numbers across the top */
+ 	for (i = 0; i < per_row; i++)
+-	    show_color_name(top + 2, (i + 1) * width, i, opt_wide);
++	    show_color_name(top + 2, (i + 1) * width, i + min_colors, opt_wide);
+ 
+ 	/* show a grid of colors, with color names/ numbers on the left */
+ 	for (i = (short) (base_row * per_row); i < pairs_max; i++) {
+@@ -1950,9 +1982,11 @@
+ 	    int col = (i % per_row + 1) * width;
+ 	    short pair = i;
+ 
++#define InxToFG(i) (short) ((i % (COLORS - min_colors)) + min_colors)
++#define InxToBG(i) (short) ((i / (COLORS - min_colors)) + min_colors)
+ 	    if (row >= 0 && move(row, col) != ERR) {
+-		short fg = (short) (i % COLORS);
+-		short bg = (short) (i / COLORS);
++		short fg = InxToFG(i);
++		short bg = InxToBG(i);
+ 
+ 		init_pair(pair, fg, bg);
+ 		attron((attr_t) COLOR_PAIR(pair));
+@@ -1960,6 +1994,8 @@
+ 		    attron((attr_t) A_ALTCHARSET);
+ 		if (opt_bold)
+ 		    attron((attr_t) A_BOLD);
++		if (opt_revs)
++		    attron((attr_t) A_REVERSE);
+ 
+ 		if (opt_nums) {
+ 		    sprintf(numbered, "{%02X}", i);
+@@ -1968,8 +2004,8 @@
+ 		printw("%-*.*s", width, width, hello);
+ 		attrset(A_NORMAL);
+ 
+-		if ((i % per_row) == 0 && (i % COLORS) == 0) {
+-		    show_color_name(row, 0, i / COLORS, opt_wide);
++		if ((i % per_row) == 0 && InxToFG(i) == min_colors) {
++		    show_color_name(row, 0, InxToBG(i), opt_wide);
+ 		}
+ 		++shown;
+ 	    } else if (shown) {
+@@ -1996,6 +2032,12 @@
+ 	case 'N':
+ 	    opt_nums = TRUE;
+ 	    break;
++	case 'r':
++	    opt_revs = FALSE;
++	    break;
++	case 'R':
++	    opt_revs = TRUE;
++	    break;
+ 	case case_QUIT:
+ 	    done = TRUE;
+ 	    continue;
+@@ -2073,7 +2115,7 @@
+     int base_row = 0;
+     int grid_top = top + 3;
+     int page_size = (LINES - grid_top);
+-    int pairs_max = COLOR_PAIRS;
++    int pairs_max = (unsigned short) (-1);
+     int row_limit;
+     int per_row;
+     char numbered[80];
+@@ -2081,12 +2123,22 @@
+     bool done = FALSE;
+     bool opt_acsc = FALSE;
+     bool opt_bold = FALSE;
++    bool opt_revs = FALSE;
+     bool opt_wide = FALSE;
+     bool opt_nums = FALSE;
+     bool opt_xchr = FALSE;
+     wchar_t buffer[10];
+     WINDOW *helpwin;
+ 
++    if (COLORS * COLORS == COLOR_PAIRS) {
++	int limit = (COLORS - min_colors) * (COLORS - min_colors);
++	if (pairs_max > limit)
++	    pairs_max = limit;
++    } else {
++	if (pairs_max > COLOR_PAIRS)
++	    pairs_max = COLOR_PAIRS;
++    }
++
+     while (!done) {
+ 	int shown = 0;
+ 
+@@ -2100,6 +2152,8 @@
+ 	    hello = "Hello";
+ 	    per_row = 8;
+ 	}
++	per_row -= min_colors;
++
+ 	if (opt_xchr) {
+ 	    make_fullwidth_text(buffer, hello);
+ 	    width *= 2;
+@@ -2111,8 +2165,9 @@
+ 	row_limit = (pairs_max + per_row - 1) / per_row;
+ 
+ 	move(0, 0);
+-	(void) printw("There are %d color pairs and %d colors\n",
+-		      pairs_max, COLORS);
++	(void) printw("There are %d color pairs and %d colors%s\n",
++		      pairs_max, COLORS,
++		      min_colors ? " besides 'default'" : "");
+ 
+ 	clrtobot();
+ 	(void) mvprintw(top + 1, 0,
+@@ -2123,7 +2178,7 @@
+ 
+ 	/* show color names/numbers across the top */
+ 	for (i = 0; i < per_row; i++)
+-	    show_color_name(top + 2, (i + 1) * width, i, opt_wide);
++	    show_color_name(top + 2, (i + 1) * width, i + min_colors, opt_wide);
+ 
+ 	/* show a grid of colors, with color names/ numbers on the left */
+ 	for (i = (base_row * per_row); i < pairs_max; i++) {
+@@ -2132,12 +2187,14 @@
+ 	    short pair = (short) i;
+ 
+ 	    if (row >= 0 && move(row, col) != ERR) {
+-		init_pair(pair, (short) (i % COLORS), (short) (i / COLORS));
++		init_pair(pair, InxToFG(i), InxToBG(i));
+ 		color_set(pair, NULL);
+ 		if (opt_acsc)
+ 		    attr_on((attr_t) A_ALTCHARSET, NULL);
+ 		if (opt_bold)
+ 		    attr_on((attr_t) A_BOLD, NULL);
++		if (opt_revs)
++		    attr_on((attr_t) A_REVERSE, NULL);
+ 
+ 		if (opt_nums) {
+ 		    sprintf(numbered, "{%02X}", i);
+@@ -2150,8 +2207,8 @@
+ 		addnwstr(buffer, width);
+ 		attr_set(A_NORMAL, 0, NULL);
+ 
+-		if ((i % per_row) == 0 && (i % COLORS) == 0) {
+-		    show_color_name(row, 0, i / COLORS, opt_wide);
++		if ((i % per_row) == 0 && InxToFG(i) == min_colors) {
++		    show_color_name(row, 0, InxToBG(i), opt_wide);
+ 		}
+ 		++shown;
+ 	    } else if (shown) {
+@@ -2178,6 +2235,12 @@
+ 	case 'N':
+ 	    opt_nums = TRUE;
+ 	    break;
++	case 'r':
++	    opt_revs = FALSE;
++	    break;
++	case 'R':
++	    opt_revs = TRUE;
++	    break;
+ 	case case_QUIT:
+ 	    done = TRUE;
+ 	    continue;
+@@ -2802,6 +2865,7 @@
+ } attrs_to_cycle[] = {
+     { A_NORMAL,		"normal" },
+     { A_BOLD,		"bold" },
++    { A_BLINK,		"blink" },
+     { A_REVERSE,	"reverse" },
+     { A_UNDERLINE,	"underline" },
+ };
+@@ -2902,7 +2966,7 @@
+ 	do {
+ 	    if (C1)
+ 		nodelay(stdscr, TRUE);
+-	    echochar(code | attr | COLOR_PAIR(pair));
++	    echochar(colored_chtype(code, attr, pair));
+ 	    if (C1) {
+ 		/* (yes, this _is_ crude) */
+ 		while ((reply = Getchar()) != ERR) {
+@@ -2951,7 +3015,7 @@
+ 		 */
+ 		break;
+ 	    default:
+-		addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair));
++		addch(colored_chtype(code, A_ALTCHARSET | attr, pair));
+ 		break;
+ 	    }
+ 	} while (--count > 0);
+@@ -2969,15 +3033,23 @@
+     mvaddstr(0, 20, "Display of the ACS Line-Drawing Set");
+     attroff(A_BOLD);
+     refresh();
+-    box(stdscr, 0, 0);
+     /* *INDENT-OFF* */
+-    mvhline(LINES / 2, 0,        ACS_HLINE | attr, COLS);
+-    mvvline(0,         COLS / 2, ACS_VLINE | attr, LINES);
+-    mvaddch(0,         COLS / 2, ACS_TTEE | attr);
+-    mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr);
+-    mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr);
+-    mvaddch(LINES / 2, 0,        ACS_LTEE | attr);
+-    mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr);
++    wborder(stdscr,
++	    colored_chtype(ACS_VLINE,	 attr, pair),
++	    colored_chtype(ACS_VLINE,	 attr, pair),
++            colored_chtype(ACS_HLINE,    attr, pair),
++	    colored_chtype(ACS_HLINE,	 attr, pair),
++	    colored_chtype(ACS_ULCORNER, attr, pair),
++	    colored_chtype(ACS_URCORNER, attr, pair),
++            colored_chtype(ACS_LLCORNER, attr, pair),
++	    colored_chtype(ACS_LRCORNER, attr, pair));
++    mvhline(LINES / 2, 0,        colored_chtype(ACS_HLINE, attr, pair), COLS);
++    mvvline(0,         COLS / 2, colored_chtype(ACS_VLINE, attr, pair), LINES);
++    mvaddch(0,         COLS / 2, colored_chtype(ACS_TTEE,  attr, pair));
++    mvaddch(LINES / 2, COLS / 2, colored_chtype(ACS_PLUS,  attr, pair));
++    mvaddch(LINES - 1, COLS / 2, colored_chtype(ACS_BTEE,  attr, pair));
++    mvaddch(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
++    mvaddch(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
+     /* *INDENT-ON* */
+ 
+ }
+@@ -3002,7 +3074,7 @@
+ {
+     int n;
+ 
+-#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair))
++#define BOTH(name) #name, colored_chtype(name, attr, pair)
+ 
+     erase();
+     attron(A_BOLD);
+@@ -3238,7 +3310,7 @@
+     int col = (n / height) * COLS / 2;
+ 
+     mvprintw(row, col, "%*s : ", COLS / 4, name);
+-    while (repeat-- >= 0) {
++    while (--repeat >= 0) {
+ 	add_wch(code);
+     }
+     return n + 1;
+@@ -3307,12 +3379,12 @@
+ 
+ #undef MERGE_ATTR
+ 
+-#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
++#define MERGE_ATTR(n,wch) merge_wide_attr(&temp[n], wch, attr, pair)
+ 
+ static void
+ show_wbox_chars(int repeat, attr_t attr, short pair)
+ {
+-    cchar_t temp;
++    cchar_t temp[8];
+ 
+     (void) repeat;
+     erase();
+@@ -3321,17 +3393,23 @@
+     attroff(A_BOLD);
+     refresh();
+ 
+-    attr_set(attr, pair, 0);
+-    box_set(stdscr, 0, 0);
+-    attr_set(A_NORMAL, 0, 0);
++    wborder_set(stdscr,
++		MERGE_ATTR(0, WACS_VLINE),
++		MERGE_ATTR(1, WACS_VLINE),
++		MERGE_ATTR(2, WACS_HLINE),
++		MERGE_ATTR(3, WACS_HLINE),
++		MERGE_ATTR(4, WACS_ULCORNER),
++		MERGE_ATTR(5, WACS_URCORNER),
++		MERGE_ATTR(6, WACS_LLCORNER),
++		MERGE_ATTR(7, WACS_LRCORNER));
+     /* *INDENT-OFF* */
+-    mvhline_set(LINES / 2, 0,        MERGE_ATTR(WACS_HLINE), COLS);
+-    mvvline_set(0,         COLS / 2, MERGE_ATTR(WACS_VLINE), LINES);
+-    mvadd_wch(0,           COLS / 2, MERGE_ATTR(WACS_TTEE));
+-    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(WACS_PLUS));
+-    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(WACS_BTEE));
+-    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(WACS_LTEE));
+-    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(WACS_RTEE));
++    mvhline_set(LINES / 2, 0,        MERGE_ATTR(0, WACS_HLINE), COLS);
++    mvvline_set(0,         COLS / 2, MERGE_ATTR(0, WACS_VLINE), LINES);
++    mvadd_wch(0,           COLS / 2, MERGE_ATTR(0, WACS_TTEE));
++    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(0, WACS_PLUS));
++    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(0, WACS_BTEE));
++    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
++    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
+     /* *INDENT-ON* */
+ 
+ }
+@@ -5804,7 +5882,7 @@
+ 	break;
+     case 2:
+ 	init_pair(cpair, COLOR_RED, COLOR_GREEN);
+-	wbkgdset(win, ' ' | A_BLINK | COLOR_PAIR(cpair));
++	wbkgdset(win, colored_chtype(' ', A_BLINK, cpair));
+ 	break;
+     case 3:
+ 	wbkgdset(win, ' ' | A_NORMAL);
+diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
+--- ncurses-5.7.orig/test/programs	2008-08-16 14:47:39.000000000 -0700
++++ ncurses-5.7/test/programs	2009-01-27 16:44:52.896037435 -0800
+@@ -1,4 +1,4 @@
+-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
++# $Id: programs,v 1.15 2008/12/20 21:38:44 tom Exp $
+ ##############################################################################
+ # Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -35,6 +35,7 @@
+ bs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	bs
+ cardfile	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	cardfile
+ chgat		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	chgat
++clip_printw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	clip_printw
+ color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set
+ demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys
+ demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey
+@@ -57,6 +58,7 @@
+ inch_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inch_wide
+ inchs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inchs
+ ins_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ins_wide
++insdelln	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	insdelln
+ inserts		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inserts
+ key_names	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	key_names
+ keynames	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	keynames
+diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
+--- ncurses-5.7.orig/test/README	2008-10-18 14:02:45.000000000 -0700
++++ ncurses-5.7/test/README	2009-01-27 16:44:52.892037156 -0800
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: README,v 1.38 2008/10/18 21:02:45 tom Exp $
++-- $Id: README,v 1.39 2008/12/20 23:38:13 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ The programs in this directory are designed to test your newest toy :-)
+@@ -87,7 +87,7 @@
+ field_status			test: demo_forms
+ field_term			-
+ field_type			test: demo_forms
+-field_userptr			test: edit_field ncurses
++field_userptr			test: demo_forms edit_field ncurses
+ form_driver			test: cardfile demo_forms edit_field ncurses
+ form_fields			test: cardfile demo_forms
+ form_init			-
+@@ -211,7 +211,7 @@
+ ----------
+ BC				-
+ COLORS				test: echochar ncurses savescreen xmas
+-COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
++COLOR_PAIR			test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
+ COLOR_PAIRS			test: echochar ncurses newdemo savescreen
+ COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
+ ESCDELAY			test: test_opaque
+@@ -239,9 +239,9 @@
+ attr_set			test: ncurses
+ attroff				test: echochar filter gdc ncurses tclock
+ attron				test: bs echochar filter gdc ncurses
+-attrset				test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
++attrset				test: bs firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
+ baudrate			lib: ncurses
+-beep				test: blue bs cardfile chgat demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
++beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
+ bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
+ bkgdset				test: background ncurses testaddch
+ bkgrnd				test: ncurses
+@@ -251,10 +251,10 @@
+ boolnames			test: test_arrays progs: dump_entry infocmp
+ border				-
+ border_set			-
+-box				test: cardfile chgat demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++box				test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ box_set				test: ncurses
+ can_change_color		test: ncurses
+-cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
++cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ chgat				test: chgat
+ clear				test: blue bs gdc ncurses testcurs xmas
+ clearok				test: bs knight
+@@ -263,7 +263,7 @@
+ color_content			test: ncurses
+ color_set			test: color_set ncurses
+ copywin				test: ncurses testcurs
+-cur_term			test: dots dots_mvcur lrtest progs: clear tput tset
++cur_term			test: dots dots_mvcur lrtest progs: clear tabs tput tset
+ curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
+ curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
+ curses_version			test: ncurses progs: infocmp tic toe tput tset
+@@ -273,16 +273,16 @@
+ del_curterm			lib: ncurses
+ delay_output			test: newdemo
+ delch				-
+-deleteln			-
++deleteln			test: insdelln
+ delscreen			test: ditto dots_mvcur
+-delwin				test: cardfile chgat demo_forms demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+-derwin				test: cardfile chgat demo_forms demo_menus ditto inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
++delwin				test: cardfile chgat clip_printw demo_forms demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++derwin				test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
+ doupdate			test: cardfile demo_menus demo_panels ditto edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_get_wstr test_getstr
+ dupwin				test: edit_field
+ echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
+ echo_wchar			test: ncurses
+ echochar			test: echochar ncurses
+-endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
++endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+ erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
+ erasechar			lib: ncurses
+ erasewchar			-
+@@ -292,16 +292,16 @@
+ get_wch				-
+ get_wstr			test: test_get_wstr
+ getattrs			-
+-getbegx				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
+-getbegy				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
++getbegx				test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
++getbegy				test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
+ getbkgd				test: ncurses
+ getbkgrnd			test: ncurses
+ getcchar			test: ncurses view
+-getch				test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest lrtest savescreen tclock test_opaque testaddch testcurs view xmas
+-getcurx				test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
+-getcury				test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen test_opaque testcurs
+-getmaxx				test: chgat demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+-getmaxy				test: chgat demo_forms demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++getch				test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
++getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
++getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
++getmaxx				test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++getmaxy				test: chgat clip_printw demo_forms demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ getmouse			test: bs knight movewindow ncurses
+ getn_wstr			test: test_get_wstr
+ getnstr				test: filter ncurses test_getstr
+@@ -310,10 +310,11 @@
+ getstr				test: test_getstr
+ getwin				test: ncurses
+ halfdelay			test: view
+-has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
++has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
+ has_ic				test: lrtest
+ has_il				lib: ncurses
+ has_key				lib: ncurses
++has_mouse			-
+ hline				test: gdc ncurses
+ hline_set			-
+ idcok				test: test_opaque
+@@ -326,16 +327,16 @@
+ inchnstr			test: inchs
+ inchstr				test: inchs
+ init_color			test: ncurses
+-init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
+-initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
++init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
++initscr				test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar filter firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+ innstr				test: test_instr
+ innwstr				test: test_inwstr
+ ins_nwstr			test: ins_wide
+ ins_wch				test: ins_wide
+ ins_wstr			test: ins_wide
+ insch				test: ins_wide inserts
+-insdelln			-
+-insertln			-
++insdelln			test: insdelln
++insertln			test: insdelln
+ insnstr				test: inserts
+ insstr				test: inserts
+ instr				test: test_instr
+@@ -360,7 +361,7 @@
+ keybound			test: demo_altkeys demo_defkey
+ keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
+ keyok				test: demo_keyok foldkeys
+-keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
++keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
+ killchar			lib: ncurses
+ killwchar			-
+ leaveok				test: hanoi test_opaque
+@@ -450,7 +451,7 @@
+ mvwinsstr			test: inserts testcurs
+ mvwinstr			test: test_instr
+ mvwinwstr			test: test_inwstr
+-mvwprintw			test: chgat demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs
++mvwprintw			test: chgat clip_printw demo_panels inch_wide inchs insdelln ncurses test_instr test_inwstr testcurs
+ mvwscanw			test: testcurs
+ mvwvline			test: ins_wide inserts movewindow
+ mvwvline_set			-
+@@ -458,11 +459,11 @@
+ newpad				test: edit_field ncurses testcurs
+ newscr				lib: ncurses
+ newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames
+-newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
++newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
+ nl				test: demo_forms ncurses rain testcurs
+ nocbreak			test: testcurs
+ nodelay				test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
+-noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
++noecho				test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ nofilter			-
+ nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
+ noqiflush			-
+@@ -501,14 +502,14 @@
+ scr_set				test: savescreen
+ scrl				test: view
+ scroll				test: testcurs
+-scrollok			test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
++scrollok			test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
+ set_curterm			lib: ncurses
+ set_escdelay			test: test_opaque
+ set_tabsize			test: test_opaque
+ set_term			lib: ncurses
+ setcchar			test: demo_panels ins_wide ncurses view
+ setscrreg			test: view
+-setupterm			test: dots progs: clear tput tset
++setupterm			test: dots progs: clear tabs tput tset
+ slk_attr			-
+ slk_attr_off			-
+ slk_attr_on			-
+@@ -528,8 +529,8 @@
+ slk_wset			test: ncurses
+ standend			test: blue gdc ncurses
+ standout			test: blue ncurses
+-start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
+-stdscr				test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
++start_color			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
++stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
+ strcodes			test: test_arrays progs: dump_entry
+ strfnames			test: test_arrays progs: dump_entry
+ strnames			test: foldkeys test_arrays progs: dump_entry infocmp tic
+@@ -548,10 +549,10 @@
+ tigetnum			test: ncurses progs: tput
+ tigetstr			test: blue demo_defkey foldkeys testcurs progs: tput
+ timeout				test: rain savescreen
+-touchline			test: chgat
+-touchwin			test: chgat demo_menus edit_field filter firstlast inch_wide inchs ins_wide inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
+-tparm				test: dots dots_mvcur progs: tic tput
+-tputs				test: dots dots_mvcur railroad progs: clear tset
++touchline			test: chgat clip_printw insdelln
++touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
++tparm				test: dots dots_mvcur progs: tabs tic tput
++tputs				test: dots dots_mvcur railroad progs: clear tabs tset
+ trace				test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
+ ttytype				lib: ncurses
+ typeahead			test: testcurs
+@@ -572,7 +573,7 @@
+ vidputs				lib: ncurses
+ vline				test: gdc ncurses
+ vline_set			-
+-vw_printw			-
++vw_printw			test: clip_printw
+ vw_scanw			-
+ vwprintw			test: movewindow
+ vwscanw				lib: ncurses
+@@ -584,7 +585,7 @@
+ waddchstr			-
+ waddnstr			lib: menu
+ waddnwstr			test: ncurses
+-waddstr				test: chgat demo_forms demo_panels edit_field firstlast ins_wide knight ncurses redraw testcurs
++waddstr				test: chgat clip_printw demo_forms demo_panels edit_field firstlast ins_wide insdelln knight ncurses redraw testcurs
+ waddwstr			test: ins_wide test_get_wstr
+ wattr_get			-
+ wattr_off			lib: ncurses
+@@ -592,21 +593,21 @@
+ wattr_set			-
+ wattroff			test: demo_forms ncurses testcurs xmas
+ wattron				test: testcurs xmas
+-wattrset			test: demo_forms ncurses newdemo test_get_wstr test_getstr testcurs xmas
++wattrset			test: clip_printw demo_forms insdelln ncurses newdemo test_get_wstr test_getstr testcurs xmas
+ wbkgd				test: cardfile demo_forms demo_menus ncurses newdemo testcurs
+ wbkgdset			test: demo_panels ins_wide inserts ncurses
+ wbkgrnd				lib: ncurses
+ wbkgrndset			lib: ncurses
+-wborder				lib: ncurses
+-wborder_set			lib: ncurses
++wborder				test: ncurses
++wborder_set			test: ncurses
+ wchgat				test: chgat test_get_wstr test_getstr view
+ wclear				test: ncurses test_opaque testcurs
+ wclrtobot			test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs
+-wclrtoeol			test: chgat demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide inserts knight ncurses test_instr test_inwstr testcurs
++wclrtoeol			test: chgat clip_printw demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide insdelln inserts knight ncurses test_instr test_inwstr testcurs
+ wcolor_set			lib: ncurses
+ wcursyncup			lib: form
+ wdelch				test: ncurses testcurs
+-wdeleteln			test: testcurs
++wdeleteln			test: insdelln testcurs
+ wecho_wchar			lib: ncurses
+ wechochar			lib: ncurses
+ wenclose			lib: form
+@@ -614,7 +615,7 @@
+ wget_wch			test: ins_wide ncurses
+ wget_wstr			test: test_get_wstr
+ wgetbkgrnd			lib: ncurses
+-wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
++wgetch				test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc insdelln inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
+ wgetn_wstr			test: ncurses test_get_wstr
+ wgetnstr			test: ncurses test_getstr
+ wgetparent			test: test_opaque
+@@ -634,18 +635,18 @@
+ wins_wch			test: ins_wide
+ wins_wstr			test: ins_wide
+ winsch				test: ins_wide inserts testcurs
+-winsdelln			lib: ncurses
+-winsertln			test: testcurs
++winsdelln			test: insdelln
++winsertln			test: insdelln testcurs
+ winsnstr			test: inserts
+ winsstr				test: inserts
+ winstr				test: test_instr
+ winwstr				test: test_inwstr
+ wmouse_trafo			lib: form
+-wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
++wmove				test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
+ wnoutrefresh			test: demo_menus ditto edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque
+-wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++wprintw				test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ wredrawln			test: redraw
+-wrefresh			test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
++wrefresh			test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels edit_field firstlast insdelln knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
+ wresize				test: cardfile ncurses
+ wscanw				test: testcurs
+ wscrl				test: ncurses testcurs
+diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
+--- ncurses-5.7.orig/test/test.priv.h	2008-10-04 14:53:41.000000000 -0700
++++ ncurses-5.7/test/test.priv.h	2009-01-27 16:44:52.896037435 -0800
+@@ -29,7 +29,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.79 2008/10/04 21:53:41 tom Exp $ */
++/* $Id: test.priv.h,v 1.80 2008/12/20 16:37:20 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -359,6 +359,9 @@
+ #define KEY_MIN 256	/* not defined in Solaris 8 */
+ #endif
+ 
++#define colored_chtype(ch, attr, pair) \
++	((ch) | (attr) | COLOR_PAIR(pair))
++
+ /*
+  * Workaround for HPUX
+  */
+diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
+--- ncurses-5.7.orig/TO-DO	2008-10-11 12:22:27.000000000 -0700
++++ ncurses-5.7/TO-DO	2009-01-27 16:44:48.051726777 -0800
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: TO-DO,v 1.51 2008/10/11 19:22:27 tom Exp $
++-- $Id: TO-DO,v 1.53 2008/11/28 16:39:12 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ SHORT-TERM TO-DO ITEMS:
+@@ -45,7 +45,7 @@
+ + Scrolling optimization has holes:  for example, it forces repaints of the
+   screen between calls to refresh().
+ 
+-+ SVr4 uses slightly different rules for determining when softkeys are shown. 
+++ SVr4 uses slightly different rules for determining when softkeys are shown.
+   For example, they are initially displayed (before the ncurses 'e' test
+   activates them), and a touchwin can apparently also force them to be
+   displayed.
+@@ -58,7 +58,7 @@
+ + The window classes defined in the c++ subdirectory need documentation.  Some
+   C++ programmer could earn a lot of good karma by doing this...
+ 
+-+ vid_attr() should support the set_a_attributes (sgr1) string, but does not. 
+++ vid_attr() should support the set_a_attributes (sgr1) string, but does not.
+   There appear to be no terminals that require that functionality.
+ 
+ + the configure --disable-ext-funcs option does not work for Ada95 tree.
+@@ -66,6 +66,24 @@
+ + the --with-pthread configuration builds for Cygwin, but does not work
+   properly (test/worm.c shows all of the worms in the same location).
+ 
+++ the Ada95 tree requires a small fix to build on Cygwin, since the GNAT port
++  to that platform provides an incomplete Interrupts.Names package.  For
++  instance (your gcc version may be different):
++        /usr/lib/gcc/i686-pc-cygwin/3.4.4/adainclude/a-intnam.ads
++
++  cut here...
++-------------------------------------------------------------------------------
++--- a-intnam.ads.orig   2003-10-21 13:41:51.000000000 +0000
+++++ a-intnam.ads        2007-05-05 22:40:02.609375000 +0000
++@@ -44,5 +44,6 @@
++
++    DUMMY_INTERRUPT_1 : constant Interrupt_ID := 1;
++    DUMMY_INTERRUPT_2 : constant Interrupt_ID := 2;
+++   SIGINT : constant Interrupt_ID := 2;
++
++ end Ada.Interrupts.Names;
++-------------------------------------------------------------------------------
++
+ + the --enable-rpath configure option builds for the corresponding platforms;
+   however combining it with --with-ticlib and --with-termlib does not always
+   produce libraries that can be run without setting environment variables.
+@@ -122,7 +140,7 @@
+ 2. DOS port
+ 
+ Only a few of the files in the library depend on the terminfo format.
+-It should be possible to further kernelize the package, then rewrite 
++It should be possible to further kernelize the package, then rewrite
+ a small number of core files to produce a functionally-compatible
+ port that would do updates to a memory-mapped screen area.  The first
+ result of this would be a DOS port.
+@@ -195,10 +213,10 @@
+ 		move_insert, dest_tabs_magic_smso, transparent_underline,
+ 		needs_xon_xoff, hard_cursor.
+ 	Numerics: lines_of_memory, buttons.
+-	Strings: pkey_key, pkey_local, pkey_xmit, underline_char, 
+-		enter_xon_mode,	exit_xon_mode, xon_character, xoff_character, 
++	Strings: pkey_key, pkey_local, pkey_xmit, underline_char,
++		enter_xon_mode,	exit_xon_mode, xon_character, xoff_character,
+ 		display_clock, remove_clock, user[0-5], display_pc_char,
+-		enter_scancode_mode, exit_scancode_mode, pc_term_options, 
++		enter_scancode_mode, exit_scancode_mode, pc_term_options,
+ 		scancode_escape, alt_scancode_esc.
+ 
+ These are the potentially important ones for ncurses.  Notes:
